cleanup

dist/index.js

@@ -1087,6 +1087,11 @@ class CloudRunner {
     static run(buildParameters, baseImage) {
         return __awaiter(this, void 0, void 0, function* () {
             yield CloudRunner.setup(buildParameters);
+            if (!CloudRunner.buildParameters.isCliMode)
+                core.startGroup('Setup shared cloud runner resources');
+            yield CloudRunner.Provider.setupWorkflow(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets);
+            if (!CloudRunner.buildParameters.isCliMode)
+                core.endGroup();
             try {
                 if (buildParameters.retainWorkspace) {
                     CloudRunner.lockedWorkspace = shared_workspace_locking_1.default.NewWorkspaceName();
@@ -1104,11 +1109,6 @@ class CloudRunner {
                         CloudRunner.lockedWorkspace = undefined;
                     }
                 }
-                if (!CloudRunner.buildParameters.isCliMode)
-                    core.startGroup('Setup shared cloud runner resources');
-                yield CloudRunner.Provider.setupWorkflow(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets);
-                if (!CloudRunner.buildParameters.isCliMode)
-                    core.endGroup();
                 const content = Object.assign({}, CloudRunner.buildParameters);
                 content.gitPrivateToken = ``;
                 content.unitySerial = ``;
@@ -2722,7 +2722,11 @@ class AWSBuildEnvironment {
     branchName, 
     // eslint-disable-next-line no-unused-vars
     defaultSecretsArray) {
-        return __awaiter(this, void 0, void 0, function* () { });
+        return __awaiter(this, void 0, void 0, function* () {
+            process.env.AWS_REGION = __1.Input.region;
+            const CF = new SDK.CloudFormation();
+            yield new aws_base_stack_1.AWSBaseStack(this.baseStackName).setupBaseStack(CF);
+        });
     }
     runTaskInWorkflow(buildGuid, image, commands, mountdir, workingdir, environment, secrets) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -2734,7 +2738,6 @@ class AWSBuildEnvironment {
             cloud_runner_logger_1.default.log(`AWS Region: ${CF.config.region}`);
             const entrypoint = ['/bin/sh'];
             const startTimeMs = Date.now();
-            yield new aws_base_stack_1.AWSBaseStack(this.baseStackName).setupBaseStack(CF);
             const taskDef = yield new aws_job_stack_1.AWSJobStack(this.baseStackName).setupCloudFormations(CF, buildGuid, image, entrypoint, commands, mountdir, workingdir, secrets);
             let postRunTaskTimeMs;
             try {

src/model/cloud-runner/cloud-runner.ts

@@ -82,6 +82,14 @@ class CloudRunner {
 
   static async run(buildParameters: BuildParameters, baseImage: string) {
     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,
+    );
+    if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
     try {
       if (buildParameters.retainWorkspace) {
         CloudRunner.lockedWorkspace = SharedWorkspaceLocking.NewWorkspaceName();
@@ -104,14 +112,6 @@ class CloudRunner {
           CloudRunner.lockedWorkspace = undefined;
         }
       }
-      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,
-      );
-      if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
       const content = { ...CloudRunner.buildParameters };
       content.gitPrivateToken = ``;
       content.unitySerial = ``;

src/model/cloud-runner/providers/aws/index.ts

@@ -75,7 +75,11 @@ class AWSBuildEnvironment implements ProviderInterface {
     branchName: string,
     // eslint-disable-next-line no-unused-vars
     defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
-  ) {}
+  ) {
+    process.env.AWS_REGION = Input.region;
+    const CF = new SDK.CloudFormation();
+    await new AwsBaseStack(this.baseStackName).setupBaseStack(CF);
+  }
 
   async runTaskInWorkflow(
     buildGuid: string,
@@ -94,8 +98,6 @@ class AWSBuildEnvironment implements ProviderInterface {
     CloudRunnerLogger.log(`AWS Region: ${CF.config.region}`);
     const entrypoint = ['/bin/sh'];
     const startTimeMs = Date.now();
-
-    await new AwsBaseStack(this.baseStackName).setupBaseStack(CF);
     const taskDef = await new AwsJobStack(this.baseStackName).setupCloudFormations(
       CF,
       buildGuid,