Refactor (extract remote-builder steps into methods)

dist/index.js

@@ -1644,10 +1644,210 @@ class RemoteBuilder {
                         ParameterValue: token,
                     },
                 ];
-                core.info('Starting part 1/4 (clone from github and restore cache)');
+                yield RemoteBuilder.SetupStep(buildUid, buildParameters, branchName, defaultSecretsArray);
-                yield aws_build_platform_1.default.runBuild(buildUid, buildParameters.awsStackName, 'alpine/git', [
+                yield RemoteBuilder.BuildStep(buildUid, buildParameters, baseImage, defaultSecretsArray);
-                    '-c',
+                yield RemoteBuilder.CompressionStep(buildUid, buildParameters, branchName, defaultSecretsArray);
-                    `apk update;
+                yield RemoteBuilder.UploadArtifacts(buildUid, buildParameters, branchName, defaultSecretsArray);
+                yield RemoteBuilder.DeployToSteam(buildUid, buildParameters);
+            }
+            catch (error) {
+                core.setFailed(error);
+                core.error(error);
+            }
+        });
+    }
+    static DeployToSteam(buildUid, buildParameters) {
+        return __awaiter(this, void 0, void 0, function* () {
+            core.info('Starting steam deployment');
+            yield aws_build_platform_1.default.runBuild(buildUid, buildParameters.awsStackName, 'cm2network/steamcmd:root', [
+                '-c',
+                `
+            ls
+            chmod -R +x /entrypoint.sh;
+            chmod -R +x /steps;
+            /entrypoint.sh;
+          `,
+            ], `/${efsDirectoryName}`, `/${efsDirectoryName}/${buildUid}/steam/action/`, [], []);
+        });
+    }
+    static UploadArtifacts(buildUid, buildParameters, branchName, defaultSecretsArray) {
+        return __awaiter(this, void 0, void 0, function* () {
+            core.info('Starting part 4/4 (upload build to s3)');
+            yield aws_build_platform_1.default.runBuild(buildUid, buildParameters.awsStackName, 'amazon/aws-cli', [
+                '-c',
+                `
+            aws s3 cp ${buildUid}/build-${buildUid}.zip s3://game-ci-storage/
+            # no need to upload Library cache for now
+            # aws s3 cp /${efsDirectoryName}/${cacheDirectoryName}/${branchName}/lib-${buildUid}.zip s3://game-ci-storage/
+            rm -r ${buildUid}
+          `,
+            ], `/${efsDirectoryName}`, `/${efsDirectoryName}/`, [
+                {
+                    name: 'GITHUB_SHA',
+                    value: process.env.GITHUB_SHA || '',
+                },
+                {
+                    name: 'AWS_DEFAULT_REGION',
+                    value: process.env.AWS_DEFAULT_REGION || '',
+                },
+            ], [
+                {
+                    ParameterKey: 'AWSAccessKeyID',
+                    EnvironmentVariable: 'AWS_ACCESS_KEY_ID',
+                    ParameterValue: process.env.AWS_ACCESS_KEY_ID || '',
+                },
+                {
+                    ParameterKey: 'AWSSecretAccessKey',
+                    EnvironmentVariable: 'AWS_SECRET_ACCESS_KEY',
+                    ParameterValue: process.env.AWS_SECRET_ACCESS_KEY || '',
+                },
+                ...defaultSecretsArray,
+            ]);
+        });
+    }
+    static CompressionStep(buildUid, buildParameters, branchName, defaultSecretsArray) {
+        return __awaiter(this, void 0, void 0, function* () {
+            core.info('Starting part 3/4 (zip unity build and Library for caching)');
+            // Cleanup
+            yield aws_build_platform_1.default.runBuild(buildUid, buildParameters.awsStackName, 'alpine', [
+                '-c',
+                `
+            apk update
+            apk add zip
+            cd Library
+            zip -q -r lib-${buildUid}.zip .*
+            mv lib-${buildUid}.zip /${efsDirectoryName}/${cacheDirectoryName}/${branchName}/lib-${buildUid}.zip
+            cd ../../
+            zip -q -r build-${buildUid}.zip ${buildParameters.buildPath}/*
+            mv build-${buildUid}.zip /${efsDirectoryName}/${buildUid}/build-${buildUid}.zip
+          `,
+            ], `/${efsDirectoryName}`, `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}`, [
+                {
+                    name: 'GITHUB_SHA',
+                    value: process.env.GITHUB_SHA || '',
+                },
+            ], defaultSecretsArray);
+        });
+    }
+    static BuildStep(buildUid, buildParameters, baseImage, defaultSecretsArray) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const buildSecrets = new Array();
+            buildSecrets.push(...defaultSecretsArray);
+            if (process.env.UNITY_LICENSE)
+                buildSecrets.push({
+                    ParameterKey: 'UnityLicense',
+                    EnvironmentVariable: 'UNITY_LICENSE',
+                    ParameterValue: process.env.UNITY_LICENSE,
+                });
+            if (process.env.UNITY_EMAIL)
+                buildSecrets.push({
+                    ParameterKey: 'UnityEmail',
+                    EnvironmentVariable: 'UNITY_EMAIL',
+                    ParameterValue: process.env.UNITY_EMAIL,
+                });
+            if (process.env.UNITY_PASSWORD)
+                buildSecrets.push({
+                    ParameterKey: 'UnityPassword',
+                    EnvironmentVariable: 'UNITY_PASSWORD',
+                    ParameterValue: process.env.UNITY_PASSWORD,
+                });
+            if (process.env.UNITY_SERIAL)
+                buildSecrets.push({
+                    ParameterKey: 'UnitySerial',
+                    EnvironmentVariable: 'UNITY_SERIAL',
+                    ParameterValue: process.env.UNITY_SERIAL,
+                });
+            if (buildParameters.androidKeystoreBase64)
+                buildSecrets.push({
+                    ParameterKey: 'AndroidKeystoreBase64',
+                    EnvironmentVariable: 'ANDROID_KEYSTORE_BASE64',
+                    ParameterValue: buildParameters.androidKeystoreBase64,
+                });
+            if (buildParameters.androidKeystorePass)
+                buildSecrets.push({
+                    ParameterKey: 'AndroidKeystorePass',
+                    EnvironmentVariable: 'ANDROID_KEYSTORE_PASS',
+                    ParameterValue: buildParameters.androidKeystorePass,
+                });
+            if (buildParameters.androidKeyaliasPass)
+                buildSecrets.push({
+                    ParameterKey: 'AndroidKeyAliasPass',
+                    EnvironmentVariable: 'AWS_ACCESS_KEY_ALIAS_PASS',
+                    ParameterValue: buildParameters.androidKeyaliasPass,
+                });
+            core.info('Starting part 2/4 (build unity project)');
+            yield aws_build_platform_1.default.runBuild(buildUid, buildParameters.awsStackName, baseImage.toString(), [
+                '-c',
+                `
+            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/default-build-script/ /UnityBuilderAction;
+            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/entrypoint.sh /entrypoint.sh;
+            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/steps/ /steps;
+            chmod -R +x /entrypoint.sh;
+            chmod -R +x /steps;
+            /entrypoint.sh;
+          `,
+            ], `/${efsDirectoryName}`, `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/`, [
+                {
+                    name: 'ContainerMemory',
+                    value: buildParameters.remoteBuildMemory,
+                },
+                {
+                    name: 'ContainerCpu',
+                    value: buildParameters.remoteBuildCpu,
+                },
+                {
+                    name: 'GITHUB_WORKSPACE',
+                    value: `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/`,
+                },
+                {
+                    name: 'PROJECT_PATH',
+                    value: buildParameters.projectPath,
+                },
+                {
+                    name: 'BUILD_PATH',
+                    value: buildParameters.buildPath,
+                },
+                {
+                    name: 'BUILD_FILE',
+                    value: buildParameters.buildFile,
+                },
+                {
+                    name: 'BUILD_NAME',
+                    value: buildParameters.buildName,
+                },
+                {
+                    name: 'BUILD_METHOD',
+                    value: buildParameters.buildMethod,
+                },
+                {
+                    name: 'CUSTOM_PARAMETERS',
+                    value: buildParameters.customParameters,
+                },
+                {
+                    name: 'BUILD_TARGET',
+                    value: buildParameters.platform,
+                },
+                {
+                    name: 'ANDROID_VERSION_CODE',
+                    value: buildParameters.androidVersionCode.toString(),
+                },
+                {
+                    name: 'ANDROID_KEYSTORE_NAME',
+                    value: buildParameters.androidKeystoreName,
+                },
+                {
+                    name: 'ANDROID_KEYALIAS_NAME',
+                    value: buildParameters.androidKeyaliasName,
+                },
+            ], buildSecrets);
+        });
+    }
+    static SetupStep(buildUid, buildParameters, branchName, defaultSecretsArray) {
+        return __awaiter(this, void 0, void 0, function* () {
+            core.info('Starting part 1/4 (clone from github and restore cache)');
+            yield aws_build_platform_1.default.runBuild(buildUid, buildParameters.awsStackName, 'alpine/git', [
+                '-c',
+                `apk update;
           apk add unzip;
           apk add git-lfs;
           apk add jq;
@@ -1699,187 +1899,12 @@ class RemoteBuilder {
           ls /${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}/Library/
           echo ' '
       `,
-                ], `/${efsDirectoryName}`, `/${efsDirectoryName}/`, [
+            ], `/${efsDirectoryName}`, `/${efsDirectoryName}/`, [
-                    {
+                {
-                        name: 'GITHUB_SHA',
+                    name: 'GITHUB_SHA',
-                        value: process.env.GITHUB_SHA || '',
+                    value: process.env.GITHUB_SHA || '',
-                    },
+                },
-                ], defaultSecretsArray);
+            ], defaultSecretsArray);
-                core.info('Starting part 2/4 (build unity project)');
-                const buildSecrets = new Array();
-                buildSecrets.push(...defaultSecretsArray);
-                if (process.env.UNITY_LICENSE)
-                    buildSecrets.push({
-                        ParameterKey: 'UnityLicense',
-                        EnvironmentVariable: 'UNITY_LICENSE',
-                        ParameterValue: process.env.UNITY_LICENSE,
-                    });
-                if (process.env.UNITY_EMAIL)
-                    buildSecrets.push({
-                        ParameterKey: 'UnityEmail',
-                        EnvironmentVariable: 'UNITY_EMAIL',
-                        ParameterValue: process.env.UNITY_EMAIL,
-                    });
-                if (process.env.UNITY_PASSWORD)
-                    buildSecrets.push({
-                        ParameterKey: 'UnityPassword',
-                        EnvironmentVariable: 'UNITY_PASSWORD',
-                        ParameterValue: process.env.UNITY_PASSWORD,
-                    });
-                if (process.env.UNITY_SERIAL)
-                    buildSecrets.push({
-                        ParameterKey: 'UnitySerial',
-                        EnvironmentVariable: 'UNITY_SERIAL',
-                        ParameterValue: process.env.UNITY_SERIAL,
-                    });
-                if (buildParameters.androidKeystoreBase64)
-                    buildSecrets.push({
-                        ParameterKey: 'AndroidKeystoreBase64',
-                        EnvironmentVariable: 'ANDROID_KEYSTORE_BASE64',
-                        ParameterValue: buildParameters.androidKeystoreBase64,
-                    });
-                if (buildParameters.androidKeystorePass)
-                    buildSecrets.push({
-                        ParameterKey: 'AndroidKeystorePass',
-                        EnvironmentVariable: 'ANDROID_KEYSTORE_PASS',
-                        ParameterValue: buildParameters.androidKeystorePass,
-                    });
-                if (buildParameters.androidKeyaliasPass)
-                    buildSecrets.push({
-                        ParameterKey: 'AndroidKeyAliasPass',
-                        EnvironmentVariable: 'AWS_ACCESS_KEY_ALIAS_PASS',
-                        ParameterValue: buildParameters.androidKeyaliasPass,
-                    });
-                yield aws_build_platform_1.default.runBuild(buildUid, buildParameters.awsStackName, baseImage.toString(), [
-                    '-c',
-                    `
-            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/default-build-script/ /UnityBuilderAction;
-            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/entrypoint.sh /entrypoint.sh;
-            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/steps/ /steps;
-            chmod -R +x /entrypoint.sh;
-            chmod -R +x /steps;
-            /entrypoint.sh;
-          `,
-                ], `/${efsDirectoryName}`, `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/`, [
-                    {
-                        name: 'ContainerMemory',
-                        value: buildParameters.remoteBuildMemory,
-                    },
-                    {
-                        name: 'ContainerCpu',
-                        value: buildParameters.remoteBuildCpu,
-                    },
-                    {
-                        name: 'GITHUB_WORKSPACE',
-                        value: `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/`,
-                    },
-                    {
-                        name: 'PROJECT_PATH',
-                        value: buildParameters.projectPath,
-                    },
-                    {
-                        name: 'BUILD_PATH',
-                        value: buildParameters.buildPath,
-                    },
-                    {
-                        name: 'BUILD_FILE',
-                        value: buildParameters.buildFile,
-                    },
-                    {
-                        name: 'BUILD_NAME',
-                        value: buildParameters.buildName,
-                    },
-                    {
-                        name: 'BUILD_METHOD',
-                        value: buildParameters.buildMethod,
-                    },
-                    {
-                        name: 'CUSTOM_PARAMETERS',
-                        value: buildParameters.customParameters,
-                    },
-                    {
-                        name: 'BUILD_TARGET',
-                        value: buildParameters.platform,
-                    },
-                    {
-                        name: 'ANDROID_VERSION_CODE',
-                        value: buildParameters.androidVersionCode.toString(),
-                    },
-                    {
-                        name: 'ANDROID_KEYSTORE_NAME',
-                        value: buildParameters.androidKeystoreName,
-                    },
-                    {
-                        name: 'ANDROID_KEYALIAS_NAME',
-                        value: buildParameters.androidKeyaliasName,
-                    },
-                ], buildSecrets);
-                core.info('Starting part 3/4 (zip unity build and Library for caching)');
-                // Cleanup
-                yield aws_build_platform_1.default.runBuild(buildUid, buildParameters.awsStackName, 'alpine', [
-                    '-c',
-                    `
-            apk update
-            apk add zip
-            cd Library
-            zip -q -r lib-${buildUid}.zip .*
-            mv lib-${buildUid}.zip /${efsDirectoryName}/${cacheDirectoryName}/${branchName}/lib-${buildUid}.zip
-            cd ../../
-            zip -q -r build-${buildUid}.zip ${buildParameters.buildPath}/*
-            mv build-${buildUid}.zip /${efsDirectoryName}/${buildUid}/build-${buildUid}.zip
-          `,
-                ], `/${efsDirectoryName}`, `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}`, [
-                    {
-                        name: 'GITHUB_SHA',
-                        value: process.env.GITHUB_SHA || '',
-                    },
-                ], defaultSecretsArray);
-                core.info('Starting part 4/4 (upload build to s3)');
-                yield aws_build_platform_1.default.runBuild(buildUid, buildParameters.awsStackName, 'amazon/aws-cli', [
-                    '-c',
-                    `
-            aws s3 cp ${buildUid}/build-${buildUid}.zip s3://game-ci-storage/
-            # no need to upload Library cache for now
-            # aws s3 cp /${efsDirectoryName}/${cacheDirectoryName}/${branchName}/lib-${buildUid}.zip s3://game-ci-storage/
-            rm -r ${buildUid}
-          `,
-                ], `/${efsDirectoryName}`, `/${efsDirectoryName}/`, [
-                    {
-                        name: 'GITHUB_SHA',
-                        value: process.env.GITHUB_SHA || '',
-                    },
-                    {
-                        name: 'AWS_DEFAULT_REGION',
-                        value: process.env.AWS_DEFAULT_REGION || '',
-                    },
-                ], [
-                    {
-                        ParameterKey: 'AWSAccessKeyID',
-                        EnvironmentVariable: 'AWS_ACCESS_KEY_ID',
-                        ParameterValue: process.env.AWS_ACCESS_KEY_ID || '',
-                    },
-                    {
-                        ParameterKey: 'AWSSecretAccessKey',
-                        EnvironmentVariable: 'AWS_SECRET_ACCESS_KEY',
-                        ParameterValue: process.env.AWS_SECRET_ACCESS_KEY || '',
-                    },
-                    ...defaultSecretsArray,
-                ]);
-                core.info('Starting steam deployment');
-                yield aws_build_platform_1.default.runBuild(buildUid, buildParameters.awsStackName, 'cm2network/steamcmd:root', [
-                    '-c',
-                    `
-            ls
-            chmod -R +x /entrypoint.sh;
-            chmod -R +x /steps;
-            /entrypoint.sh;
-          `,
-                ], `/${efsDirectoryName}`, `/${efsDirectoryName}/${buildUid}/steam/action/`, [], []);
-            }
-            catch (error) {
-                core.setFailed(error);
-                core.error(error);
-            }
         });
     }
 }

src/model/remote-builder/remote-builder.ts

@@ -23,15 +23,272 @@ class RemoteBuilder {
           ParameterValue: token,
         },
       ];
+      await RemoteBuilder.SetupStep(buildUid, buildParameters, branchName, defaultSecretsArray);
+      await RemoteBuilder.BuildStep(buildUid, buildParameters, baseImage, defaultSecretsArray);
+      await RemoteBuilder.CompressionStep(buildUid, buildParameters, branchName, defaultSecretsArray);
+      await RemoteBuilder.UploadArtifacts(buildUid, buildParameters, branchName, defaultSecretsArray);
+      await RemoteBuilder.DeployToSteam(buildUid, buildParameters);
+    } catch (error) {
+      core.setFailed(error);
+      core.error(error);
+    }
+  }
 
-      core.info('Starting part 1/4 (clone from github and restore cache)');
+  private static async DeployToSteam(buildUid: string, buildParameters: BuildParameters) {
-      await AWSBuildPlatform.runBuild(
+    core.info('Starting steam deployment');
-        buildUid,
+    await AWSBuildPlatform.runBuild(
-        buildParameters.awsStackName,
+      buildUid,
-        'alpine/git',
+      buildParameters.awsStackName,
-        [
+      'cm2network/steamcmd:root',
-          '-c',
+      [
-          `apk update;
+        '-c',
+        `
+            ls
+            chmod -R +x /entrypoint.sh;
+            chmod -R +x /steps;
+            /entrypoint.sh;
+          `,
+      ],
+      `/${efsDirectoryName}`,
+      `/${efsDirectoryName}/${buildUid}/steam/action/`,
+      [],
+      [],
+    );
+  }
+
+  private static async UploadArtifacts(
+    buildUid: string,
+    buildParameters: BuildParameters,
+    branchName: string | undefined,
+    defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
+  ) {
+    core.info('Starting part 4/4 (upload build to s3)');
+    await AWSBuildPlatform.runBuild(
+      buildUid,
+      buildParameters.awsStackName,
+      'amazon/aws-cli',
+      [
+        '-c',
+        `
+            aws s3 cp ${buildUid}/build-${buildUid}.zip s3://game-ci-storage/
+            # no need to upload Library cache for now
+            # aws s3 cp /${efsDirectoryName}/${cacheDirectoryName}/${branchName}/lib-${buildUid}.zip s3://game-ci-storage/
+            rm -r ${buildUid}
+          `,
+      ],
+      `/${efsDirectoryName}`,
+      `/${efsDirectoryName}/`,
+      [
+        {
+          name: 'GITHUB_SHA',
+          value: process.env.GITHUB_SHA || '',
+        },
+        {
+          name: 'AWS_DEFAULT_REGION',
+          value: process.env.AWS_DEFAULT_REGION || '',
+        },
+      ],
+      [
+        {
+          ParameterKey: 'AWSAccessKeyID',
+          EnvironmentVariable: 'AWS_ACCESS_KEY_ID',
+          ParameterValue: process.env.AWS_ACCESS_KEY_ID || '',
+        },
+        {
+          ParameterKey: 'AWSSecretAccessKey',
+          EnvironmentVariable: 'AWS_SECRET_ACCESS_KEY',
+          ParameterValue: process.env.AWS_SECRET_ACCESS_KEY || '',
+        },
+        ...defaultSecretsArray,
+      ],
+    );
+  }
+
+  private static async CompressionStep(
+    buildUid: string,
+    buildParameters: BuildParameters,
+    branchName: string | undefined,
+    defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
+  ) {
+    core.info('Starting part 3/4 (zip unity build and Library for caching)');
+    // Cleanup
+    await AWSBuildPlatform.runBuild(
+      buildUid,
+      buildParameters.awsStackName,
+      'alpine',
+      [
+        '-c',
+        `
+            apk update
+            apk add zip
+            cd Library
+            zip -q -r lib-${buildUid}.zip .*
+            mv lib-${buildUid}.zip /${efsDirectoryName}/${cacheDirectoryName}/${branchName}/lib-${buildUid}.zip
+            cd ../../
+            zip -q -r build-${buildUid}.zip ${buildParameters.buildPath}/*
+            mv build-${buildUid}.zip /${efsDirectoryName}/${buildUid}/build-${buildUid}.zip
+          `,
+      ],
+      `/${efsDirectoryName}`,
+      `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}`,
+      [
+        {
+          name: 'GITHUB_SHA',
+          value: process.env.GITHUB_SHA || '',
+        },
+      ],
+      defaultSecretsArray,
+    );
+  }
+
+  private static async BuildStep(
+    buildUid: string,
+    buildParameters: BuildParameters,
+    baseImage: any,
+    defaultSecretsArray: any[],
+  ) {
+    const buildSecrets = new Array();
+
+    buildSecrets.push(...defaultSecretsArray);
+
+    if (process.env.UNITY_LICENSE)
+      buildSecrets.push({
+        ParameterKey: 'UnityLicense',
+        EnvironmentVariable: 'UNITY_LICENSE',
+        ParameterValue: process.env.UNITY_LICENSE,
+      });
+
+    if (process.env.UNITY_EMAIL)
+      buildSecrets.push({
+        ParameterKey: 'UnityEmail',
+        EnvironmentVariable: 'UNITY_EMAIL',
+        ParameterValue: process.env.UNITY_EMAIL,
+      });
+
+    if (process.env.UNITY_PASSWORD)
+      buildSecrets.push({
+        ParameterKey: 'UnityPassword',
+        EnvironmentVariable: 'UNITY_PASSWORD',
+        ParameterValue: process.env.UNITY_PASSWORD,
+      });
+
+    if (process.env.UNITY_SERIAL)
+      buildSecrets.push({
+        ParameterKey: 'UnitySerial',
+        EnvironmentVariable: 'UNITY_SERIAL',
+        ParameterValue: process.env.UNITY_SERIAL,
+      });
+
+    if (buildParameters.androidKeystoreBase64)
+      buildSecrets.push({
+        ParameterKey: 'AndroidKeystoreBase64',
+        EnvironmentVariable: 'ANDROID_KEYSTORE_BASE64',
+        ParameterValue: buildParameters.androidKeystoreBase64,
+      });
+
+    if (buildParameters.androidKeystorePass)
+      buildSecrets.push({
+        ParameterKey: 'AndroidKeystorePass',
+        EnvironmentVariable: 'ANDROID_KEYSTORE_PASS',
+        ParameterValue: buildParameters.androidKeystorePass,
+      });
+
+    if (buildParameters.androidKeyaliasPass)
+      buildSecrets.push({
+        ParameterKey: 'AndroidKeyAliasPass',
+        EnvironmentVariable: 'AWS_ACCESS_KEY_ALIAS_PASS',
+        ParameterValue: buildParameters.androidKeyaliasPass,
+      });
+    core.info('Starting part 2/4 (build unity project)');
+    await AWSBuildPlatform.runBuild(
+      buildUid,
+      buildParameters.awsStackName,
+      baseImage.toString(),
+      [
+        '-c',
+        `
+            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/default-build-script/ /UnityBuilderAction;
+            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/entrypoint.sh /entrypoint.sh;
+            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/steps/ /steps;
+            chmod -R +x /entrypoint.sh;
+            chmod -R +x /steps;
+            /entrypoint.sh;
+          `,
+      ],
+      `/${efsDirectoryName}`,
+      `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/`,
+      [
+        {
+          name: 'ContainerMemory',
+          value: buildParameters.remoteBuildMemory,
+        },
+        {
+          name: 'ContainerCpu',
+          value: buildParameters.remoteBuildCpu,
+        },
+        {
+          name: 'GITHUB_WORKSPACE',
+          value: `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/`,
+        },
+        {
+          name: 'PROJECT_PATH',
+          value: buildParameters.projectPath,
+        },
+        {
+          name: 'BUILD_PATH',
+          value: buildParameters.buildPath,
+        },
+        {
+          name: 'BUILD_FILE',
+          value: buildParameters.buildFile,
+        },
+        {
+          name: 'BUILD_NAME',
+          value: buildParameters.buildName,
+        },
+        {
+          name: 'BUILD_METHOD',
+          value: buildParameters.buildMethod,
+        },
+        {
+          name: 'CUSTOM_PARAMETERS',
+          value: buildParameters.customParameters,
+        },
+        {
+          name: 'BUILD_TARGET',
+          value: buildParameters.platform,
+        },
+        {
+          name: 'ANDROID_VERSION_CODE',
+          value: buildParameters.androidVersionCode.toString(),
+        },
+        {
+          name: 'ANDROID_KEYSTORE_NAME',
+          value: buildParameters.androidKeystoreName,
+        },
+        {
+          name: 'ANDROID_KEYALIAS_NAME',
+          value: buildParameters.androidKeyaliasName,
+        },
+      ],
+      buildSecrets,
+    );
+  }
+
+  private static async SetupStep(
+    buildUid: string,
+    buildParameters: BuildParameters,
+    branchName: string | undefined,
+    defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
+  ) {
+    core.info('Starting part 1/4 (clone from github and restore cache)');
+    await AWSBuildPlatform.runBuild(
+      buildUid,
+      buildParameters.awsStackName,
+      'alpine/git',
+      [
+        '-c',
+        `apk update;
           apk add unzip;
           apk add git-lfs;
           apk add jq;
@@ -83,240 +340,17 @@ class RemoteBuilder {
           ls /${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}/Library/
           echo ' '
       `,
-        ],
+      ],
-        `/${efsDirectoryName}`,
+      `/${efsDirectoryName}`,
-        `/${efsDirectoryName}/`,
+      `/${efsDirectoryName}/`,
-        [
+      [
-          {
+        {
-            name: 'GITHUB_SHA',
+          name: 'GITHUB_SHA',
-            value: process.env.GITHUB_SHA || '',
+          value: process.env.GITHUB_SHA || '',
-          },
+        },
-        ],
+      ],
-        defaultSecretsArray,
+      defaultSecretsArray,
-      );
+    );
-
-      core.info('Starting part 2/4 (build unity project)');
-
-      const buildSecrets = new Array();
-
-      buildSecrets.push(...defaultSecretsArray);
-
-      if (process.env.UNITY_LICENSE)
-        buildSecrets.push({
-          ParameterKey: 'UnityLicense',
-          EnvironmentVariable: 'UNITY_LICENSE',
-          ParameterValue: process.env.UNITY_LICENSE,
-        });
-
-      if (process.env.UNITY_EMAIL)
-        buildSecrets.push({
-          ParameterKey: 'UnityEmail',
-          EnvironmentVariable: 'UNITY_EMAIL',
-          ParameterValue: process.env.UNITY_EMAIL,
-        });
-
-      if (process.env.UNITY_PASSWORD)
-        buildSecrets.push({
-          ParameterKey: 'UnityPassword',
-          EnvironmentVariable: 'UNITY_PASSWORD',
-          ParameterValue: process.env.UNITY_PASSWORD,
-        });
-
-      if (process.env.UNITY_SERIAL)
-        buildSecrets.push({
-          ParameterKey: 'UnitySerial',
-          EnvironmentVariable: 'UNITY_SERIAL',
-          ParameterValue: process.env.UNITY_SERIAL,
-        });
-
-      if (buildParameters.androidKeystoreBase64)
-        buildSecrets.push({
-          ParameterKey: 'AndroidKeystoreBase64',
-          EnvironmentVariable: 'ANDROID_KEYSTORE_BASE64',
-          ParameterValue: buildParameters.androidKeystoreBase64,
-        });
-
-      if (buildParameters.androidKeystorePass)
-        buildSecrets.push({
-          ParameterKey: 'AndroidKeystorePass',
-          EnvironmentVariable: 'ANDROID_KEYSTORE_PASS',
-          ParameterValue: buildParameters.androidKeystorePass,
-        });
-
-      if (buildParameters.androidKeyaliasPass)
-        buildSecrets.push({
-          ParameterKey: 'AndroidKeyAliasPass',
-          EnvironmentVariable: 'AWS_ACCESS_KEY_ALIAS_PASS',
-          ParameterValue: buildParameters.androidKeyaliasPass,
-        });
-
-      await AWSBuildPlatform.runBuild(
-        buildUid,
-        buildParameters.awsStackName,
-        baseImage.toString(),
-        [
-          '-c',
-          `
-            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/default-build-script/ /UnityBuilderAction;
-            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/entrypoint.sh /entrypoint.sh;
-            cp -r /${efsDirectoryName}/${buildUid}/builder/dist/steps/ /steps;
-            chmod -R +x /entrypoint.sh;
-            chmod -R +x /steps;
-            /entrypoint.sh;
-          `,
-        ],
-        `/${efsDirectoryName}`,
-        `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/`,
-        [
-          {
-            name: 'ContainerMemory',
-            value: buildParameters.remoteBuildMemory,
-          },
-          {
-            name: 'ContainerCpu',
-            value: buildParameters.remoteBuildCpu,
-          },
-          {
-            name: 'GITHUB_WORKSPACE',
-            value: `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/`,
-          },
-          {
-            name: 'PROJECT_PATH',
-            value: buildParameters.projectPath,
-          },
-          {
-            name: 'BUILD_PATH',
-            value: buildParameters.buildPath,
-          },
-          {
-            name: 'BUILD_FILE',
-            value: buildParameters.buildFile,
-          },
-          {
-            name: 'BUILD_NAME',
-            value: buildParameters.buildName,
-          },
-          {
-            name: 'BUILD_METHOD',
-            value: buildParameters.buildMethod,
-          },
-          {
-            name: 'CUSTOM_PARAMETERS',
-            value: buildParameters.customParameters,
-          },
-          {
-            name: 'BUILD_TARGET',
-            value: buildParameters.platform,
-          },
-          {
-            name: 'ANDROID_VERSION_CODE',
-            value: buildParameters.androidVersionCode.toString(),
-          },
-          {
-            name: 'ANDROID_KEYSTORE_NAME',
-            value: buildParameters.androidKeystoreName,
-          },
-          {
-            name: 'ANDROID_KEYALIAS_NAME',
-            value: buildParameters.androidKeyaliasName,
-          },
-        ],
-        buildSecrets,
-      );
-      core.info('Starting part 3/4 (zip unity build and Library for caching)');
-      // Cleanup
-      await AWSBuildPlatform.runBuild(
-        buildUid,
-        buildParameters.awsStackName,
-        'alpine',
-        [
-          '-c',
-          `
-            apk update
-            apk add zip
-            cd Library
-            zip -q -r lib-${buildUid}.zip .*
-            mv lib-${buildUid}.zip /${efsDirectoryName}/${cacheDirectoryName}/${branchName}/lib-${buildUid}.zip
-            cd ../../
-            zip -q -r build-${buildUid}.zip ${buildParameters.buildPath}/*
-            mv build-${buildUid}.zip /${efsDirectoryName}/${buildUid}/build-${buildUid}.zip
-          `,
-        ],
-        `/${efsDirectoryName}`,
-        `/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}`,
-        [
-          {
-            name: 'GITHUB_SHA',
-            value: process.env.GITHUB_SHA || '',
-          },
-        ],
-        defaultSecretsArray,
-      );
-
-      core.info('Starting part 4/4 (upload build to s3)');
-      await AWSBuildPlatform.runBuild(
-        buildUid,
-        buildParameters.awsStackName,
-        'amazon/aws-cli',
-        [
-          '-c',
-          `
-            aws s3 cp ${buildUid}/build-${buildUid}.zip s3://game-ci-storage/
-            # no need to upload Library cache for now
-            # aws s3 cp /${efsDirectoryName}/${cacheDirectoryName}/${branchName}/lib-${buildUid}.zip s3://game-ci-storage/
-            rm -r ${buildUid}
-          `,
-        ],
-        `/${efsDirectoryName}`,
-        `/${efsDirectoryName}/`,
-        [
-          {
-            name: 'GITHUB_SHA',
-            value: process.env.GITHUB_SHA || '',
-          },
-          {
-            name: 'AWS_DEFAULT_REGION',
-            value: process.env.AWS_DEFAULT_REGION || '',
-          },
-        ],
-        [
-          {
-            ParameterKey: 'AWSAccessKeyID',
-            EnvironmentVariable: 'AWS_ACCESS_KEY_ID',
-            ParameterValue: process.env.AWS_ACCESS_KEY_ID || '',
-          },
-          {
-            ParameterKey: 'AWSSecretAccessKey',
-            EnvironmentVariable: 'AWS_SECRET_ACCESS_KEY',
-            ParameterValue: process.env.AWS_SECRET_ACCESS_KEY || '',
-          },
-          ...defaultSecretsArray,
-        ],
-      );
-
-      core.info('Starting steam deployment');
-      await AWSBuildPlatform.runBuild(
-        buildUid,
-        buildParameters.awsStackName,
-        'cm2network/steamcmd:root',
-        [
-          '-c',
-          `
-            ls
-            chmod -R +x /entrypoint.sh;
-            chmod -R +x /steps;
-            /entrypoint.sh;
-          `,
-        ],
-        `/${efsDirectoryName}`,
-        `/${efsDirectoryName}/${buildUid}/steam/action/`,
-        [],
-        [],
-      );
-    } catch (error) {
-      core.setFailed(error);
-      core.error(error);
-    }
   }
 }
 export default RemoteBuilder;