actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

pull/531/head
Frostebite 2023-12-09 18:29:09 +00:00
parent bd3de93524
commit 41f1f8bd29
5 changed files with 1 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
dist/index.js generated vendored
View File

@ -807,11 +807,7 @@ class CloudRunner {
throw new Error(`baseImage is undefined`); throw new Error(`baseImage is undefined`);
} }
await CloudRunner.setup(buildParameters); await CloudRunner.setup(buildParameters);
if (!CloudRunner.buildParameters.isCliMode)
core.startGroup('Setup shared cloud runner resources');
await CloudRunner.Provider.setupWorkflow(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets); await CloudRunner.Provider.setupWorkflow(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets);
if (!CloudRunner.buildParameters.isCliMode)
core.endGroup();
try { try {
if (buildParameters.maxRetainedWorkspaces > 0) { if (buildParameters.maxRetainedWorkspaces > 0) {
CloudRunner.lockedWorkspace = shared_workspace_locking_1.default.NewWorkspaceName(); CloudRunner.lockedWorkspace = shared_workspace_locking_1.default.NewWorkspaceName();
@ -831,10 +827,7 @@ class CloudRunner {
} }
await CloudRunner.updateStatusWithBuildParameters(); await CloudRunner.updateStatusWithBuildParameters();
const output = await new workflow_composition_root_1.WorkflowCompositionRoot().run(new cloud_runner_step_parameters_1.CloudRunnerStepParameters(baseImage, CloudRunner.cloudRunnerEnvironmentVariables, CloudRunner.defaultSecrets)); const output = await new workflow_composition_root_1.WorkflowCompositionRoot().run(new cloud_runner_step_parameters_1.CloudRunnerStepParameters(baseImage, CloudRunner.cloudRunnerEnvironmentVariables, CloudRunner.defaultSecrets));
if (!CloudRunner.buildParameters.isCliMode)
core.startGroup('Cleanup shared cloud runner resources');
await CloudRunner.Provider.cleanupWorkflow(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets); await CloudRunner.Provider.cleanupWorkflow(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets);
cloud_runner_logger_1.default.log(`Cleanup complete`);
if (!CloudRunner.buildParameters.isCliMode) if (!CloudRunner.buildParameters.isCliMode)
core.endGroup(); core.endGroup();
if ((buildParameters.asyncWorkflow && this.isCloudRunnerEnvironment) || !buildParameters.asyncWorkflow) { if ((buildParameters.asyncWorkflow && this.isCloudRunnerEnvironment) || !buildParameters.asyncWorkflow) {
@ -5526,29 +5519,6 @@ exports.CommandHookService = CommandHookService;
"use strict"; "use strict";
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
var __importDefault = (this && this.__importDefault) || function (mod) { var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod }; return (mod && mod.__esModule) ? mod : { "default": mod };
}; };
@ -5556,7 +5526,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.ContainerHookService = void 0; exports.ContainerHookService = void 0;
const yaml_1 = __importDefault(__nccwpck_require__(44083)); const yaml_1 = __importDefault(__nccwpck_require__(44083));
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144)); const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
const core = __importStar(__nccwpck_require__(42186));
const custom_workflow_1 = __nccwpck_require__(3786); const custom_workflow_1 = __nccwpck_require__(3786);
const remote_client_logger_1 = __nccwpck_require__(59412); const remote_client_logger_1 = __nccwpck_require__(59412);
const node_path_1 = __importDefault(__nccwpck_require__(49411)); const node_path_1 = __importDefault(__nccwpck_require__(49411));
@ -5765,11 +5734,7 @@ class ContainerHookService {
...ContainerHookService.GetContainerHooksFromFiles(`after`), ...ContainerHookService.GetContainerHooksFromFiles(`after`),
]; ];
if (steps.length > 0) { if (steps.length > 0) {
if (!cloud_runner_1.default.buildParameters.isCliMode)
core.startGroup('post build steps');
output += await custom_workflow_1.CustomWorkflow.runContainerJob(steps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets); output += await custom_workflow_1.CustomWorkflow.runContainerJob(steps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
if (!cloud_runner_1.default.buildParameters.isCliMode)
core.endGroup();
} }
return output; return output;
} }
@ -5780,11 +5745,7 @@ class ContainerHookService {
...ContainerHookService.GetContainerHooksFromFiles(`before`), ...ContainerHookService.GetContainerHooksFromFiles(`before`),
]; ];
if (steps.length > 0) { if (steps.length > 0) {
if (!cloud_runner_1.default.buildParameters.isCliMode)
core.startGroup('pre build steps');
output += await custom_workflow_1.CustomWorkflow.runContainerJob(steps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets); output += await custom_workflow_1.CustomWorkflow.runContainerJob(steps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
if (!cloud_runner_1.default.buildParameters.isCliMode)
core.endGroup();
} }
return output; return output;
} }
@ -5929,29 +5890,6 @@ exports.AsyncWorkflow = AsyncWorkflow;
"use strict"; "use strict";
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
var __importDefault = (this && this.__importDefault) || function (mod) { var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod }; return (mod && mod.__esModule) ? mod : { "default": mod };
}; };
@ -5959,7 +5897,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.BuildAutomationWorkflow = void 0; exports.BuildAutomationWorkflow = void 0;
const cloud_runner_logger_1 = __importDefault(__nccwpck_require__(42864)); const cloud_runner_logger_1 = __importDefault(__nccwpck_require__(42864));
const cloud_runner_folders_1 = __nccwpck_require__(77795); const cloud_runner_folders_1 = __nccwpck_require__(77795);
const core = __importStar(__nccwpck_require__(42186));
const command_hook_service_1 = __nccwpck_require__(96159); const command_hook_service_1 = __nccwpck_require__(96159);
const node_path_1 = __importDefault(__nccwpck_require__(49411)); const node_path_1 = __importDefault(__nccwpck_require__(49411));
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144)); const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
@ -5974,14 +5911,10 @@ class BuildAutomationWorkflow {
let output = ''; let output = '';
output += await container_hook_service_1.ContainerHookService.RunPreBuildSteps(cloudRunnerStepState); output += await container_hook_service_1.ContainerHookService.RunPreBuildSteps(cloudRunnerStepState);
cloud_runner_logger_1.default.logWithTime('Configurable pre build step(s) time'); cloud_runner_logger_1.default.logWithTime('Configurable pre build step(s) time');
if (!cloud_runner_1.default.buildParameters.isCliMode)
core.startGroup('build');
cloud_runner_logger_1.default.log(baseImage); cloud_runner_logger_1.default.log(baseImage);
cloud_runner_logger_1.default.logLine(` `); cloud_runner_logger_1.default.logLine(` `);
cloud_runner_logger_1.default.logLine('Starting build automation job'); cloud_runner_logger_1.default.logLine('Starting build automation job');
output += await cloud_runner_1.default.Provider.runTaskInWorkflow(cloud_runner_1.default.buildParameters.buildGuid, baseImage.toString(), BuildAutomationWorkflow.BuildWorkflow, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}`, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}/`, cloudRunnerStepState.environment, cloudRunnerStepState.secrets); output += await cloud_runner_1.default.Provider.runTaskInWorkflow(cloud_runner_1.default.buildParameters.buildGuid, baseImage.toString(), BuildAutomationWorkflow.BuildWorkflow, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}`, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}/`, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
if (!cloud_runner_1.default.buildParameters.isCliMode)
core.endGroup();
cloud_runner_logger_1.default.logWithTime('Build time'); cloud_runner_logger_1.default.logWithTime('Build time');
output += await container_hook_service_1.ContainerHookService.RunPostBuildSteps(cloudRunnerStepState); output += await container_hook_service_1.ContainerHookService.RunPostBuildSteps(cloudRunnerStepState);
cloud_runner_logger_1.default.logWithTime('Configurable post build step(s) time'); cloud_runner_logger_1.default.logWithTime('Configurable post build step(s) time');

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

4
src/model/cloud-runner/cloud-runner.ts
View File

@ -87,14 +87,12 @@ class CloudRunner {
throw new Error(`baseImage is undefined`); throw new Error(`baseImage is undefined`);
} }
await CloudRunner.setup(buildParameters); await CloudRunner.setup(buildParameters);
if (!CloudRunner.buildParameters.isCliMode) core.startGroup('Setup shared cloud runner resources');
await CloudRunner.Provider.setupWorkflow( await CloudRunner.Provider.setupWorkflow(
CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters.buildGuid,
CloudRunner.buildParameters, CloudRunner.buildParameters,
CloudRunner.buildParameters.branch, CloudRunner.buildParameters.branch,
CloudRunner.defaultSecrets, CloudRunner.defaultSecrets,
); );
if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
try { try {
if (buildParameters.maxRetainedWorkspaces > 0) { if (buildParameters.maxRetainedWorkspaces > 0) {
CloudRunner.lockedWorkspace = SharedWorkspaceLocking.NewWorkspaceName(); CloudRunner.lockedWorkspace = SharedWorkspaceLocking.NewWorkspaceName();
@ -125,14 +123,12 @@ class CloudRunner {
CloudRunner.defaultSecrets, CloudRunner.defaultSecrets,
), ),
); );
if (!CloudRunner.buildParameters.isCliMode) core.startGroup('Cleanup shared cloud runner resources');
await CloudRunner.Provider.cleanupWorkflow( await CloudRunner.Provider.cleanupWorkflow(
CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters.buildGuid,
CloudRunner.buildParameters, CloudRunner.buildParameters,
CloudRunner.buildParameters.branch, CloudRunner.buildParameters.branch,
CloudRunner.defaultSecrets, CloudRunner.defaultSecrets,
); );
CloudRunnerLogger.log(`Cleanup complete`);
if (!CloudRunner.buildParameters.isCliMode) core.endGroup(); if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
if ((buildParameters.asyncWorkflow && this.isCloudRunnerEnvironment) || !buildParameters.asyncWorkflow) { if ((buildParameters.asyncWorkflow && this.isCloudRunnerEnvironment) || !buildParameters.asyncWorkflow) {
await GitHub.updateGitHubCheck(CloudRunner.buildParameters.buildGuid, `success`, `success`, `completed`); await GitHub.updateGitHubCheck(CloudRunner.buildParameters.buildGuid, `success`, `success`, `completed`);

5
src/model/cloud-runner/services/hooks/container-hook-service.ts
View File

@ -1,6 +1,5 @@
import YAML from 'yaml'; import YAML from 'yaml';
import CloudRunner from '../../cloud-runner'; import CloudRunner from '../../cloud-runner';
import * as core from '@actions/core';
import { CustomWorkflow } from '../../workflows/custom-workflow'; import { CustomWorkflow } from '../../workflows/custom-workflow';
import { RemoteClientLogger } from '../../remote-client/remote-client-logger'; import { RemoteClientLogger } from '../../remote-client/remote-client-logger';
import path from 'node:path'; import path from 'node:path';
@ -237,13 +236,11 @@ export class ContainerHookService {
]; ];
if (steps.length > 0) { if (steps.length > 0) {
if (!CloudRunner.buildParameters.isCliMode) core.startGroup('post build steps');
output += await CustomWorkflow.runContainerJob( output += await CustomWorkflow.runContainerJob(
steps, steps,
cloudRunnerStepState.environment, cloudRunnerStepState.environment,
cloudRunnerStepState.secrets, cloudRunnerStepState.secrets,
); );
if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
} }
return output; return output;
@ -256,13 +253,11 @@ export class ContainerHookService {
]; ];
if (steps.length > 0) { if (steps.length > 0) {
if (!CloudRunner.buildParameters.isCliMode) core.startGroup('pre build steps');
output += await CustomWorkflow.runContainerJob( output += await CustomWorkflow.runContainerJob(
steps, steps,
cloudRunnerStepState.environment, cloudRunnerStepState.environment,
cloudRunnerStepState.secrets, cloudRunnerStepState.secrets,
); );
if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
} }
return output; return output;

4
src/model/cloud-runner/workflows/build-automation-workflow.ts
View File

@ -2,7 +2,6 @@ import CloudRunnerLogger from '../services/core/cloud-runner-logger';
import { CloudRunnerFolders } from '../options/cloud-runner-folders'; import { CloudRunnerFolders } from '../options/cloud-runner-folders';
import { CloudRunnerStepParameters } from '../options/cloud-runner-step-parameters'; import { CloudRunnerStepParameters } from '../options/cloud-runner-step-parameters';
import { WorkflowInterface } from './workflow-interface'; import { WorkflowInterface } from './workflow-interface';
import * as core from '@actions/core';
import { CommandHookService } from '../services/hooks/command-hook-service'; import { CommandHookService } from '../services/hooks/command-hook-service';
import path from 'node:path'; import path from 'node:path';
import CloudRunner from '../cloud-runner'; import CloudRunner from '../cloud-runner';
@ -21,8 +20,6 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
output += await ContainerHookService.RunPreBuildSteps(cloudRunnerStepState); output += await ContainerHookService.RunPreBuildSteps(cloudRunnerStepState);
CloudRunnerLogger.logWithTime('Configurable pre build step(s) time'); CloudRunnerLogger.logWithTime('Configurable pre build step(s) time');
if (!CloudRunner.buildParameters.isCliMode) core.startGroup('build');
CloudRunnerLogger.log(baseImage); CloudRunnerLogger.log(baseImage);
CloudRunnerLogger.logLine(` `); CloudRunnerLogger.logLine(` `);
CloudRunnerLogger.logLine('Starting build automation job'); CloudRunnerLogger.logLine('Starting build automation job');
@ -36,7 +33,6 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
cloudRunnerStepState.environment, cloudRunnerStepState.environment,
cloudRunnerStepState.secrets, cloudRunnerStepState.secrets,
); );
if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
CloudRunnerLogger.logWithTime('Build time'); CloudRunnerLogger.logWithTime('Build time');
output += await ContainerHookService.RunPostBuildSteps(cloudRunnerStepState); output += await ContainerHookService.RunPostBuildSteps(cloudRunnerStepState);