From c33cae93f2a65e6dea6c5ac743e2bf23c294f9b8 Mon Sep 17 00:00:00 2001
From: Frostebite <jas.f.ukcmti@gmail.com>
Date: Mon, 6 Mar 2023 15:55:55 +0000
Subject: [PATCH] cleanup

---
 src/model/cloud-runner/cloud-runner.ts           | 16 ++++++++--------
 .../services/cloud-runner-custom-hooks.ts        |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/model/cloud-runner/cloud-runner.ts b/src/model/cloud-runner/cloud-runner.ts
index 486c3dcb..e00de64f 100644
--- a/src/model/cloud-runner/cloud-runner.ts
+++ b/src/model/cloud-runner/cloud-runner.ts
@@ -83,6 +83,14 @@ class CloudRunner {
   static async run(buildParameters: BuildParameters, baseImage: string) {
     await CloudRunner.setup(buildParameters);
     try {
+      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();
       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 = ``;
diff --git a/src/model/cloud-runner/services/cloud-runner-custom-hooks.ts b/src/model/cloud-runner/services/cloud-runner-custom-hooks.ts
index f51c32c0..2e512a49 100644
--- a/src/model/cloud-runner/services/cloud-runner-custom-hooks.ts
+++ b/src/model/cloud-runner/services/cloud-runner-custom-hooks.ts
@@ -45,7 +45,8 @@ echo "---${buildParameters.logId}"`;
 
   static GetCustomHooksFromFiles(hookLifecycle: string): Hook[] {
     const results: Hook[] = [];
-    RemoteClientLogger.log(`GetCustomHookFiles: ${hookLifecycle}`);
+
+    // RemoteClientLogger.log(`GetCustomHookFiles: ${hookLifecycle}`);
     try {
       const gameCiCustomHooksPath = path.join(process.cwd(), `game-ci`, `hooks`);
       const files = fs.readdirSync(gameCiCustomHooksPath);