Fix: check for retained workspace

dist/index.js

@@ -296,6 +296,7 @@ class BuildParameters {
                 readInputFromOverrideList: cloud_runner_options_1.default.readInputFromOverrideList(),
                 kubeStorageClass: cloud_runner_options_1.default.kubeStorageClass,
                 cacheKey: cloud_runner_options_1.default.cacheKey,
+                retainWorkspace: cloud_runner_options_1.default.retainWorkspaces,
             };
         });
     }
@@ -485,6 +486,7 @@ const cloud_runner_options_reader_1 = __importDefault(__nccwpck_require__(3343))
 const github_1 = __importDefault(__nccwpck_require__(83654));
 const task_parameter_serializer_1 = __nccwpck_require__(35346);
 const cloud_runner_folders_1 = __nccwpck_require__(13527);
+const cloud_runner_system_1 = __nccwpck_require__(99393);
 class Cli {
     static get isCliMode() {
         return Cli.options !== undefined && Cli.options.mode !== undefined && Cli.options.mode !== '';
@@ -587,6 +589,9 @@ class Cli {
             core.info(`Running POST build tasks`);
             yield caching_1.Caching.PushToCache(cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(`${cloud_runner_folders_1.CloudRunnerFolders.cacheFolderFull}/Library`), cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.libraryFolderAbsolute), `lib-${buildParameter.buildGuid}`);
             yield caching_1.Caching.PushToCache(cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(`${cloud_runner_folders_1.CloudRunnerFolders.cacheFolderFull}/build`), cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.projectBuildFolderAbsolute), `build-${buildParameter.buildGuid}`);
+            if (!buildParameter.retainWorkspace) {
+                yield cloud_runner_system_1.CloudRunnerSystem.Run(`rm -r ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}`);
+            }
             return new Promise((result) => result(``));
         });
     }
@@ -5164,11 +5169,7 @@ class BuildAutomationWorkflow {
     /entrypoint.sh
     echo "game ci cloud runner push library to cache"
     chmod +x ${builderPath}
-    node ${builderPath} -m remote-cli-post-build
-    ${BuildAutomationWorkflow.GetCleanupCommand(cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute)}`;
-    }
-    static GetCleanupCommand(cleanupPath) {
-        return cloud_runner_options_1.default.retainWorkspaces ? `` : `rm -r ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cleanupPath)}`;
+    node ${builderPath} -m remote-cli-post-build`;
     }
 }
 exports.BuildAutomationWorkflow = BuildAutomationWorkflow;

src/model/build-parameters.ts

@@ -63,6 +63,7 @@ class BuildParameters {
   public cloudRunnerIntegrationTests!: boolean;
   public cloudRunnerBuilderPlatform!: string | undefined;
   public isCliMode!: boolean;
+  public retainWorkspace!: boolean;
 
   static async create(): Promise<BuildParameters> {
     const buildFile = this.parseBuildFile(Input.buildName, Input.targetPlatform, Input.androidAppBundle);
@@ -137,6 +138,7 @@ class BuildParameters {
       readInputFromOverrideList: CloudRunnerOptions.readInputFromOverrideList(),
       kubeStorageClass: CloudRunnerOptions.kubeStorageClass,
       cacheKey: CloudRunnerOptions.cacheKey,
+      retainWorkspace: CloudRunnerOptions.retainWorkspaces,
     };
   }
 

src/model/cli/cli.ts

@@ -13,6 +13,7 @@ import CloudRunnerOptionsReader from '../cloud-runner/services/cloud-runner-opti
 import GitHub from '../github';
 import { TaskParameterSerializer } from '../cloud-runner/services/task-parameter-serializer';
 import { CloudRunnerFolders } from '../cloud-runner/services/cloud-runner-folders';
+import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system';
 
 export class Cli {
   public static options;
@@ -144,6 +145,12 @@ export class Cli {
       `build-${buildParameter.buildGuid}`,
     );
 
+    if (!buildParameter.retainWorkspace) {
+      await CloudRunnerSystem.Run(
+        `rm -r ${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}`,
+      );
+    }
+
     return new Promise((result) => result(``));
   }
 }

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

@@ -154,11 +154,6 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
     /entrypoint.sh
     echo "game ci cloud runner push library to cache"
     chmod +x ${builderPath}
-    node ${builderPath} -m remote-cli-post-build
-    ${BuildAutomationWorkflow.GetCleanupCommand(CloudRunnerFolders.projectPathAbsolute)}`;
-  }
-
-  private static GetCleanupCommand(cleanupPath: string) {
-    return CloudRunnerOptions.retainWorkspaces ? `` : `rm -r ${CloudRunnerFolders.ToLinuxFolder(cleanupPath)}`;
+    node ${builderPath} -m remote-cli-post-build`;
   }
 }