correcting bug with async env
parent
d00dc2830e
commit
97543ba50b
|
@ -1008,13 +1008,12 @@ const local_1 = __importDefault(__nccwpck_require__(66575));
|
||||||
const docker_1 = __importDefault(__nccwpck_require__(42802));
|
const docker_1 = __importDefault(__nccwpck_require__(42802));
|
||||||
const github_1 = __importDefault(__nccwpck_require__(83654));
|
const github_1 = __importDefault(__nccwpck_require__(83654));
|
||||||
const shared_workspace_locking_1 = __importDefault(__nccwpck_require__(87562));
|
const shared_workspace_locking_1 = __importDefault(__nccwpck_require__(87562));
|
||||||
const cloud_runner_options_1 = __importDefault(__nccwpck_require__(96552));
|
|
||||||
class CloudRunner {
|
class CloudRunner {
|
||||||
static get isCloudRunnerEnvironment() {
|
static get isCloudRunnerEnvironment() {
|
||||||
return process.env.cloudRunnerCluster !== undefined && process.env.cloudRunnerCluster !== `local`;
|
return (process.env[`GAMECI_CLOUD_RUNNER_CLUSTER`] !== undefined && process.env[`GAMECI_CLOUD_RUNNER_CLUSTER`] !== `local`);
|
||||||
}
|
}
|
||||||
static get isCloudRunnerAsyncEnvironment() {
|
static get isCloudRunnerAsyncEnvironment() {
|
||||||
return CloudRunner.isCloudRunnerEnvironment && cloud_runner_options_1.default.asyncCloudRunner;
|
return process.env[`GAMECI_ASYNC`] !== undefined && process.env[`GAMECI_ASYNC`] === `true`;
|
||||||
}
|
}
|
||||||
static setup(buildParameters) {
|
static setup(buildParameters) {
|
||||||
cloud_runner_logger_1.default.setup();
|
cloud_runner_logger_1.default.setup();
|
||||||
|
@ -4990,6 +4989,19 @@ class CloudRunnerCustomSteps {
|
||||||
exports.CloudRunnerCustomSteps = CloudRunnerCustomSteps;
|
exports.CloudRunnerCustomSteps = CloudRunnerCustomSteps;
|
||||||
|
|
||||||
|
|
||||||
|
/***/ }),
|
||||||
|
|
||||||
|
/***/ 79691:
|
||||||
|
/***/ ((__unused_webpack_module, exports) => {
|
||||||
|
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||||
|
class CloudRunnerEnvironmentVariable {
|
||||||
|
}
|
||||||
|
exports["default"] = CloudRunnerEnvironmentVariable;
|
||||||
|
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
/***/ 13527:
|
/***/ 13527:
|
||||||
|
@ -6197,12 +6209,16 @@ 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) {
|
||||||
return yield async_workflow_1.AsyncWorkflow.runAsyncWorkflow(cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
|
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);
|
||||||
}
|
}
|
||||||
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);
|
||||||
|
@ -6491,7 +6507,7 @@ class GitHub {
|
||||||
data.completed_at = GitHub.endedDate || GitHub.startedDate;
|
data.completed_at = GitHub.endedDate || GitHub.startedDate;
|
||||||
data.conclusion = result;
|
data.conclusion = result;
|
||||||
}
|
}
|
||||||
if (cloud_runner_1.default.isCloudRunnerEnvironment) {
|
if (cloud_runner_1.default.isCloudRunnerEnvironment && cloud_runner_1.default.isCloudRunnerAsyncEnvironment) {
|
||||||
yield GitHub.runUpdateAsyncChecksWorkflow(data, `update`);
|
yield GitHub.runUpdateAsyncChecksWorkflow(data, `update`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -15,7 +15,6 @@ import LocalCloudRunner from './providers/local';
|
||||||
import LocalDockerCloudRunner from './providers/docker';
|
import LocalDockerCloudRunner from './providers/docker';
|
||||||
import GitHub from '../github';
|
import GitHub from '../github';
|
||||||
import SharedWorkspaceLocking from './services/shared-workspace-locking';
|
import SharedWorkspaceLocking from './services/shared-workspace-locking';
|
||||||
import CloudRunnerOptions from './cloud-runner-options';
|
|
||||||
|
|
||||||
class CloudRunner {
|
class CloudRunner {
|
||||||
public static Provider: ProviderInterface;
|
public static Provider: ProviderInterface;
|
||||||
|
@ -26,10 +25,12 @@ class CloudRunner {
|
||||||
public static readonly retainedWorkspacePrefix: string = `retained-workspace`;
|
public static readonly retainedWorkspacePrefix: string = `retained-workspace`;
|
||||||
public static githubCheckId;
|
public static githubCheckId;
|
||||||
public static get isCloudRunnerEnvironment() {
|
public static get isCloudRunnerEnvironment() {
|
||||||
return process.env[`GAMECI_CLOUD_RUNNER_CLUSTER`] !== undefined && process.env[`GAMECI_CLOUD_RUNNER_CLUSTER`] !== `local`;
|
return (
|
||||||
|
process.env[`GAMECI_CLOUD_RUNNER_CLUSTER`] !== undefined && process.env[`GAMECI_CLOUD_RUNNER_CLUSTER`] !== `local`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
public static get isCloudRunnerAsyncEnvironment() {
|
public static get isCloudRunnerAsyncEnvironment() {
|
||||||
return CloudRunner.isCloudRunnerEnvironment && CloudRunnerOptions.asyncCloudRunner;
|
return process.env[`GAMECI_ASYNC`] !== undefined && process.env[`GAMECI_ASYNC`] === `true`;
|
||||||
}
|
}
|
||||||
public static setup(buildParameters: BuildParameters) {
|
public static setup(buildParameters: BuildParameters) {
|
||||||
CloudRunnerLogger.setup();
|
CloudRunnerLogger.setup();
|
||||||
|
|
|
@ -5,12 +5,20 @@ 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) {
|
||||||
return await AsyncWorkflow.runAsyncWorkflow(cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
|
const asyncEnvironmentVariable = new CloudRunnerEnvironmentVariable();
|
||||||
|
asyncEnvironmentVariable.name = `GAMECI_ASYNC`;
|
||||||
|
asyncEnvironmentVariable.value = `true`;
|
||||||
|
|
||||||
|
return await AsyncWorkflow.runAsyncWorkflow(
|
||||||
|
[...cloudRunnerStepState.environment, asyncEnvironmentVariable],
|
||||||
|
cloudRunnerStepState.secrets,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CloudRunner.buildParameters.customJob !== '') {
|
if (CloudRunner.buildParameters.customJob !== '') {
|
||||||
|
|
|
@ -114,7 +114,7 @@ class GitHub {
|
||||||
data.conclusion = result;
|
data.conclusion = result;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CloudRunner.isCloudRunnerEnvironment && CloudRunnerOptions.asyncCloudRunner) {
|
if (CloudRunner.isCloudRunnerEnvironment && CloudRunner.isCloudRunnerAsyncEnvironment) {
|
||||||
await GitHub.runUpdateAsyncChecksWorkflow(data, `update`);
|
await GitHub.runUpdateAsyncChecksWorkflow(data, `update`);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue