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

correcting bug with async env

pull/496/head
Frostebite 2023-01-21 00:58:14 +00:00
parent 1c592d7be7
commit 540d271357
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/index.js generated vendored
View File

@ -5936,6 +5936,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.AsyncWorkflow = void 0;
const cloud_runner_environment_variable_1 = __importDefault(__nccwpck_require__(79691));
const cloud_runner_logger_1 = __importDefault(__nccwpck_require__(22855));
const cloud_runner_folders_1 = __nccwpck_require__(13527);
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
@ -5944,6 +5945,9 @@ class AsyncWorkflow {
return __awaiter(this, void 0, void 0, function* () {
try {
cloud_runner_logger_1.default.log(`Cloud Runner is running async mode`);
const asyncEnvironmentVariable = new cloud_runner_environment_variable_1.default();
asyncEnvironmentVariable.name = `async`;
asyncEnvironmentVariable.value = `true`;
let output = '';
output += yield cloud_runner_1.default.Provider.runTaskInWorkflow(cloud_runner_1.default.buildParameters.buildGuid, `ubuntu`, `apt-get update > /dev/null
apt-get install -y curl tar tree npm git git-lfs jq git > /dev/null
@ -5959,7 +5963,7 @@ curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip
unzip awscliv2.zip
./aws/install
aws --version
node /builder/dist/index.js -m async-workflow`, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}`, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}/`, environmentVariables, [
node /builder/dist/index.js -m async-workflow`, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}`, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}/`, [...environmentVariables, asyncEnvironmentVariable], [
...secrets,
...[
{
@ -6209,16 +6213,12 @@ const build_automation_workflow_1 = __nccwpck_require__(94655);
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
const cloud_runner_options_1 = __importDefault(__nccwpck_require__(96552));
const async_workflow_1 = __nccwpck_require__(8231);
const cloud_runner_environment_variable_1 = __importDefault(__nccwpck_require__(79691));
class WorkflowCompositionRoot {
run(cloudRunnerStepState) {
return __awaiter(this, void 0, void 0, function* () {
try {
if (cloud_runner_options_1.default.asyncCloudRunner) {
const asyncEnvironmentVariable = new cloud_runner_environment_variable_1.default();
asyncEnvironmentVariable.name = `GAMECI_ASYNC`;
asyncEnvironmentVariable.value = `true`;
return yield async_workflow_1.AsyncWorkflow.runAsyncWorkflow([...cloudRunnerStepState.environment, asyncEnvironmentVariable], cloudRunnerStepState.secrets);
return yield async_workflow_1.AsyncWorkflow.runAsyncWorkflow(cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
}
if (cloud_runner_1.default.buildParameters.customJob !== '') {
return yield custom_workflow_1.CustomWorkflow.runCustomJobFromString(cloud_runner_1.default.buildParameters.customJob, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);

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

File diff suppressed because one or more lines are too long

5
src/model/cloud-runner/workflows/async-workflow.ts
View File

@ -11,6 +11,9 @@ export class AsyncWorkflow {
): Promise<string> {
try {
CloudRunnerLogger.log(`Cloud Runner is running async mode`);
const asyncEnvironmentVariable = new CloudRunnerEnvironmentVariable();
asyncEnvironmentVariable.name = `async`;
asyncEnvironmentVariable.value = `true`;
let output = '';
@ -34,7 +37,7 @@ aws --version
node /builder/dist/index.js -m async-workflow`,
`/${CloudRunnerFolders.buildVolumeFolder}`,
`/${CloudRunnerFolders.buildVolumeFolder}/`,
environmentVariables,
[...environmentVariables, asyncEnvironmentVariable],
[
...secrets,
...[

10
src/model/cloud-runner/workflows/workflow-composition-root.ts
View File

@ -5,20 +5,12 @@ import { BuildAutomationWorkflow } from './build-automation-workflow';
import CloudRunner from '../cloud-runner';
import CloudRunnerOptions from '../cloud-runner-options';
import { AsyncWorkflow } from './async-workflow';
import CloudRunnerEnvironmentVariable from '../services/cloud-runner-environment-variable';
export class WorkflowCompositionRoot implements WorkflowInterface {
async run(cloudRunnerStepState: CloudRunnerStepState) {
try {
if (CloudRunnerOptions.asyncCloudRunner) {
const asyncEnvironmentVariable = new CloudRunnerEnvironmentVariable();
asyncEnvironmentVariable.name = `GAMECI_ASYNC`;
asyncEnvironmentVariable.value = `true`;
return await AsyncWorkflow.runAsyncWorkflow(
[...cloudRunnerStepState.environment, asyncEnvironmentVariable],
cloudRunnerStepState.secrets,
);
return await AsyncWorkflow.runAsyncWorkflow(cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
}
if (CloudRunner.buildParameters.customJob !== '') {