correcting bug with async env
parent
1c592d7be7
commit
540d271357
|
@ -5936,6 +5936,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||||
};
|
};
|
||||||
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||||
exports.AsyncWorkflow = void 0;
|
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_logger_1 = __importDefault(__nccwpck_require__(22855));
|
||||||
const cloud_runner_folders_1 = __nccwpck_require__(13527);
|
const cloud_runner_folders_1 = __nccwpck_require__(13527);
|
||||||
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
|
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
|
||||||
|
@ -5944,6 +5945,9 @@ class AsyncWorkflow {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
try {
|
try {
|
||||||
cloud_runner_logger_1.default.log(`Cloud Runner is running async mode`);
|
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 = '';
|
let output = '';
|
||||||
output += yield cloud_runner_1.default.Provider.runTaskInWorkflow(cloud_runner_1.default.buildParameters.buildGuid, `ubuntu`, `apt-get update > /dev/null
|
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
|
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
|
unzip awscliv2.zip
|
||||||
./aws/install
|
./aws/install
|
||||||
aws --version
|
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,
|
...secrets,
|
||||||
...[
|
...[
|
||||||
{
|
{
|
||||||
|
@ -6209,16 +6213,12 @@ const build_automation_workflow_1 = __nccwpck_require__(94655);
|
||||||
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
|
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
|
||||||
const cloud_runner_options_1 = __importDefault(__nccwpck_require__(96552));
|
const cloud_runner_options_1 = __importDefault(__nccwpck_require__(96552));
|
||||||
const async_workflow_1 = __nccwpck_require__(8231);
|
const async_workflow_1 = __nccwpck_require__(8231);
|
||||||
const cloud_runner_environment_variable_1 = __importDefault(__nccwpck_require__(79691));
|
|
||||||
class WorkflowCompositionRoot {
|
class WorkflowCompositionRoot {
|
||||||
run(cloudRunnerStepState) {
|
run(cloudRunnerStepState) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
try {
|
try {
|
||||||
if (cloud_runner_options_1.default.asyncCloudRunner) {
|
if (cloud_runner_options_1.default.asyncCloudRunner) {
|
||||||
const asyncEnvironmentVariable = new cloud_runner_environment_variable_1.default();
|
return yield async_workflow_1.AsyncWorkflow.runAsyncWorkflow(cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
|
||||||
asyncEnvironmentVariable.name = `GAMECI_ASYNC`;
|
|
||||||
asyncEnvironmentVariable.value = `true`;
|
|
||||||
return yield async_workflow_1.AsyncWorkflow.runAsyncWorkflow([...cloudRunnerStepState.environment, asyncEnvironmentVariable], cloudRunnerStepState.secrets);
|
|
||||||
}
|
}
|
||||||
if (cloud_runner_1.default.buildParameters.customJob !== '') {
|
if (cloud_runner_1.default.buildParameters.customJob !== '') {
|
||||||
return yield custom_workflow_1.CustomWorkflow.runCustomJobFromString(cloud_runner_1.default.buildParameters.customJob, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
|
return yield custom_workflow_1.CustomWorkflow.runCustomJobFromString(cloud_runner_1.default.buildParameters.customJob, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -11,6 +11,9 @@ export class AsyncWorkflow {
|
||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
try {
|
try {
|
||||||
CloudRunnerLogger.log(`Cloud Runner is running async mode`);
|
CloudRunnerLogger.log(`Cloud Runner is running async mode`);
|
||||||
|
const asyncEnvironmentVariable = new CloudRunnerEnvironmentVariable();
|
||||||
|
asyncEnvironmentVariable.name = `async`;
|
||||||
|
asyncEnvironmentVariable.value = `true`;
|
||||||
|
|
||||||
let output = '';
|
let output = '';
|
||||||
|
|
||||||
|
@ -34,7 +37,7 @@ aws --version
|
||||||
node /builder/dist/index.js -m async-workflow`,
|
node /builder/dist/index.js -m async-workflow`,
|
||||||
`/${CloudRunnerFolders.buildVolumeFolder}`,
|
`/${CloudRunnerFolders.buildVolumeFolder}`,
|
||||||
`/${CloudRunnerFolders.buildVolumeFolder}/`,
|
`/${CloudRunnerFolders.buildVolumeFolder}/`,
|
||||||
environmentVariables,
|
[...environmentVariables, asyncEnvironmentVariable],
|
||||||
[
|
[
|
||||||
...secrets,
|
...secrets,
|
||||||
...[
|
...[
|
||||||
|
|
|
@ -5,20 +5,12 @@ import { BuildAutomationWorkflow } from './build-automation-workflow';
|
||||||
import CloudRunner from '../cloud-runner';
|
import CloudRunner from '../cloud-runner';
|
||||||
import CloudRunnerOptions from '../cloud-runner-options';
|
import CloudRunnerOptions from '../cloud-runner-options';
|
||||||
import { AsyncWorkflow } from './async-workflow';
|
import { AsyncWorkflow } from './async-workflow';
|
||||||
import CloudRunnerEnvironmentVariable from '../services/cloud-runner-environment-variable';
|
|
||||||
|
|
||||||
export class WorkflowCompositionRoot implements WorkflowInterface {
|
export class WorkflowCompositionRoot implements WorkflowInterface {
|
||||||
async run(cloudRunnerStepState: CloudRunnerStepState) {
|
async run(cloudRunnerStepState: CloudRunnerStepState) {
|
||||||
try {
|
try {
|
||||||
if (CloudRunnerOptions.asyncCloudRunner) {
|
if (CloudRunnerOptions.asyncCloudRunner) {
|
||||||
const asyncEnvironmentVariable = new CloudRunnerEnvironmentVariable();
|
return await AsyncWorkflow.runAsyncWorkflow(cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
|
||||||
asyncEnvironmentVariable.name = `GAMECI_ASYNC`;
|
|
||||||
asyncEnvironmentVariable.value = `true`;
|
|
||||||
|
|
||||||
return await AsyncWorkflow.runAsyncWorkflow(
|
|
||||||
[...cloudRunnerStepState.environment, asyncEnvironmentVariable],
|
|
||||||
cloudRunnerStepState.secrets,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CloudRunner.buildParameters.customJob !== '') {
|
if (CloudRunner.buildParameters.customJob !== '') {
|
||||||
|
|
Loading…
Reference in New Issue