Cleanup tree usage

dist/index.js

@@ -5454,9 +5454,6 @@ class BuildAutomationWorkflow {
         const buildHooks = cloud_runner_custom_hooks_1.CloudRunnerCustomHooks.getHooks(cloud_runner_1.default.buildParameters.customJobHooks).filter((x) => x.step.includes(`build`));
         const builderPath = cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist', `index.js`));
         return `apt-get update > /dev/null
-      ${cloud_runner_1.default.buildParameters.cloudRunnerDebug
-            ? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-            : ``}
       apt-get install -y tar tree npm git-lfs jq git > /dev/null
       npm install -g n > /dev/null
       n stable > /dev/null
@@ -5470,31 +5467,27 @@ class BuildAutomationWorkflow {
     }
     static setupCommands(builderPath) {
         const commands = `mkdir -p ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)} && git clone -q -b ${cloud_runner_1.default.buildParameters.cloudRunnerBranch} ${cloud_runner_folders_1.CloudRunnerFolders.unityBuilderRepoUrl} "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)}" && chmod +x ${builderPath}`;
-        const retainedWorkspaceCommands = `if [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}" ] && [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute, `.git`))}" ]; then echo "Retained Workspace Already Exists!"; fi`;
+        const TreeWorkspace = cloud_runner_1.default.buildParameters.cloudRunnerDebug
+            ? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
+            : ``;
+        const retainedWorkspaceCommands = `if [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}" ] && [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute, `.git`))}" ]; then echo "Retained Workspace Already Exists!" && ${TreeWorkspace}; fi`;
         const cloneBuilderCommands = `if [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}" ] && [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, `.git`))}" ]; then echo "Builder Already Exists!"; else ${commands}; fi`;
         return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
     echo "game ci cloud runner clone"
-    ${cloud_runner_1.default.buildParameters.cloudRunnerDebug
-            ? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-            : ``}
     ${retainedWorkspaceCommands}
-    ${cloud_runner_1.default.buildParameters.cloudRunnerDebug
-            ? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-            : ``}
     ${cloneBuilderCommands}
-    ${cloud_runner_1.default.buildParameters.cloudRunnerDebug
+    ${TreeWorkspace}
-            ? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-            : ``}
     echo "game ci cloud runner bootstrap"
     node ${builderPath} -m remote-cli-pre-build
-    ${cloud_runner_1.default.buildParameters.cloudRunnerDebug
+    ${TreeWorkspace}`;
-            ? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-            : ``}`;
     }
     // ToDo: Replace with a very simple "node ${builderPath} -m build-cli" to run the scripts below without enlarging the request size
     static BuildCommands(builderPath) {
         const distFolder = path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist');
         const ubuntuPlatformsFolder = path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist', 'platforms', 'ubuntu');
+        const TreeWorkspace = cloud_runner_1.default.buildParameters.cloudRunnerDebug
+            ? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
+            : ``;
         return `echo "game ci cloud runner init"
     mkdir -p ${`${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.projectBuildFolderAbsolute)}/build`}
     cd ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute)}
@@ -5507,13 +5500,9 @@ class BuildAutomationWorkflow {
     /entrypoint.sh
     echo "game ci cloud runner push library to cache"
     chmod +x ${builderPath}
-    ${cloud_runner_1.default.buildParameters.cloudRunnerDebug
+    ${TreeWorkspace}
-            ? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-            : ``}
     node ${builderPath} -m remote-cli-post-build
-    ${cloud_runner_1.default.buildParameters.cloudRunnerDebug
+    ${TreeWorkspace}`;
-            ? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-            : ``}`;
     }
 }
 exports.BuildAutomationWorkflow = BuildAutomationWorkflow;

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

@@ -96,11 +96,6 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
     );
 
     return `apt-get update > /dev/null
-      ${
-        CloudRunner.buildParameters.cloudRunnerDebug
-          ? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-          : ``
-      }
       apt-get install -y tar tree npm git-lfs jq git > /dev/null
       npm install -g n > /dev/null
       n stable > /dev/null
@@ -120,11 +115,15 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
       CloudRunnerFolders.unityBuilderRepoUrl
     } "${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.builderPathAbsolute)}" && chmod +x ${builderPath}`;
 
+    const TreeWorkspace = CloudRunner.buildParameters.cloudRunnerDebug
+      ? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
+      : ``;
+
     const retainedWorkspaceCommands = `if [ -e "${CloudRunnerFolders.ToLinuxFolder(
       CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute,
     )}" ] && [ -e "${CloudRunnerFolders.ToLinuxFolder(
       path.join(CloudRunnerFolders.repoPathAbsolute, `.git`),
-    )}" ]; then echo "Retained Workspace Already Exists!"; fi`;
+    )}" ]; then echo "Retained Workspace Already Exists!" && ${TreeWorkspace}; fi`;
 
     const cloneBuilderCommands = `if [ -e "${CloudRunnerFolders.ToLinuxFolder(
       CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute,
@@ -134,30 +133,12 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
 
     return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
     echo "game ci cloud runner clone"
-    ${
-      CloudRunner.buildParameters.cloudRunnerDebug
-        ? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-        : ``
-    }
     ${retainedWorkspaceCommands}
-    ${
-      CloudRunner.buildParameters.cloudRunnerDebug
-        ? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-        : ``
-    }
     ${cloneBuilderCommands}
-    ${
+    ${TreeWorkspace}
-      CloudRunner.buildParameters.cloudRunnerDebug
-        ? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-        : ``
-    }
     echo "game ci cloud runner bootstrap"
     node ${builderPath} -m remote-cli-pre-build
-    ${
+    ${TreeWorkspace}`;
-      CloudRunner.buildParameters.cloudRunnerDebug
-        ? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-        : ``
-    }`;
   }
 
   // ToDo: Replace with a very simple "node ${builderPath} -m build-cli" to run the scripts below without enlarging the request size
@@ -165,6 +146,10 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
     const distFolder = path.join(CloudRunnerFolders.builderPathAbsolute, 'dist');
     const ubuntuPlatformsFolder = path.join(CloudRunnerFolders.builderPathAbsolute, 'dist', 'platforms', 'ubuntu');
 
+    const TreeWorkspace = CloudRunner.buildParameters.cloudRunnerDebug
+      ? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
+      : ``;
+
     return `echo "game ci cloud runner init"
     mkdir -p ${`${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.projectBuildFolderAbsolute)}/build`}
     cd ${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.projectPathAbsolute)}
@@ -177,16 +162,8 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
     /entrypoint.sh
     echo "game ci cloud runner push library to cache"
     chmod +x ${builderPath}
-    ${
+    ${TreeWorkspace}
-      CloudRunner.buildParameters.cloudRunnerDebug
-        ? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-        : ``
-    }
     node ${builderPath} -m remote-cli-post-build
-    ${
+    ${TreeWorkspace}`;
-      CloudRunner.buildParameters.cloudRunnerDebug
-        ? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
-        : ``
-    }`;
   }
 }