refactor builder steps to shell scripts

dist/index.js

@@ -2090,6 +2090,10 @@ class RemoteBuilder {
             const repoPathFull = `${buildPathFull}/${repositoryFolder}`;
             const projectPathFull = `${repoPathFull}/${buildParameters.projectPath}`;
             const libraryFolderFull = `${projectPathFull}/Library`;
+            const repo = `https://${buildParameters.githubToken}@github.com/game-ci/unity-builder.git`;
+            const repo2 = `https://${buildParameters.githubToken}@github.com/game-ci/steam-deploy.git`;
+            const repo3 = `https://${buildParameters.githubToken}@github.com/${process.env.GITHUB_REPOSITORY}.git`;
+            const purgeRemoteCache = process.env.PURGE_REMOTE_BUILDER_CACHE === undefined;
             yield this.RemoteBuilderProviderPlatform.runBuildTask(buildUid, 'alpine/git', [
                 ` apk update
           apk add unzip
@@ -2100,58 +2104,17 @@ class RemoteBuilder {
           mkdir ${repoPathFull}
           mkdir ${steamPathFull}
           echo "Cloning utility repositories required for building:"
-          git clone -q https://${buildParameters.githubToken}@github.com/game-ci/unity-builder.git ${builderPathFull}
+          git clone -q ${repo} ${builderPathFull}
-          git clone -q https://${buildParameters.githubToken}@github.com/game-ci/steam-deploy.git ${steamPathFull}
+          git clone -q ${repo2} ${steamPathFull}
-          cd ${repoPathFull}
+          ${builderPathFull}/dist/remote-builder/cloneNoLFS.sh
-          # DISABLE LFS
+          ${builderPathFull}/dist/remote-builder/combineLFSHash.sh
-          git config --global filter.lfs.smudge "git-lfs smudge --skip -- %f"
+          ${builderPathFull}/dist/remote-builder/setupCache.sh
-          git config --global filter.lfs.process "git-lfs filter-process --skip"
+          ${builderPathFull}/dist/remote-builder/handleCaching.sh
-          echo ''
+          ${builderPathFull}/dist/remote-builder/cloneNoLFS.sh ${repoPathFull} ${repo3} $GITHUB_SHA
-          echo "Cloning the repository being built:"
+          ${builderPathFull}/dist/remote-builder/combineLFSHash.sh ${repoPathFull}
-          git init -q
+          ${builderPathFull}/dist/remote-builder/setupCache.sh ${cacheFolderFull} ${branchName} ${libraryFolderFull}
-          git remote add origin https://${buildParameters.githubToken}@github.com/${process.env.GITHUB_REPOSITORY}.git
+          ${builderPathFull}/dist/remote-builder/handleCaching.sh ${branchName} ${libraryFolderFull} ${purgeRemoteCache}
-          git fetch origin
+          echo 'Printing out important directories'
-          echo $GITHUB_SHA
-          git reset --hard $GITHUB_SHA
-          git lfs ls-files --all
-          echo ''
-          echo "Combining LFS hash files into one hash, this is used as the cache key:"
-          git lfs ls-files -l | cut -d' ' -f1 | sort > ${repoPathFull}/lfsSum.txt
-          ls -a
-          cat ${repoPathFull}/lfsSum.txt
-          echo '^ checksum'
-          echo ''
-          # time to handle library cache
-          if [ ! -d ${cacheFolderFull} ]; then
-            mkdir ${cacheFolderFull}
-            echo "creating new cache folder"
-          fi
-          if [ ! -d ${cacheFolderFull}/${branchName} ]; then
-            mkdir ${cacheFolderFull}/${branchName}
-            echo "creating new cache branch folder for: ${branchName}"
-          fi
-          echo "Library cache for branch: ${branchName}"
-          ls ${cacheFolderFull}/${branchName}
-          echo ''
-          if [ -d ${libraryFolderFull} ]; then
-            rm -r ${libraryFolderFull}
-            echo "Git must ignore the Library folder"
-          fi
-          echo "Checking cache"
-          # Restore cache
-          latest=$(ls -t | head -1)
-          if [ ! -z "$latest" ]; then
-            echo "Library cache exists from build $latest from ${branchName}"
-            echo 'Creating empty Library folder for cache'
-            mkdir $libDir
-            unzip -q $latest -d $libDir
-            # purge cache
-            ${process.env.PURGE_REMOTE_BUILDER_CACHE === undefined ? '#' : ''} rm -r $libDir
-          else
-            echo 'Cache does not exist'
-          fi
-          # Print out important directories
-          echo ''
           echo 'Repo:'
           ls /${buildVolumeFolder}/${buildUid}/${repositoryFolder}/
           echo ''

dist/remote-builder/cloneNoLFS.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+repoPathFull=$1
+cloneUrl=$2
+githubSha=$3
+
+cd $repoPathFull
+# DISABLE LFS
+git config --global filter.lfs.smudge "git-lfs smudge --skip -- %f"
+git config --global filter.lfs.process "git-lfs filter-process --skip"
+echo ''
+echo "Cloning the repository being built:"
+git init -q
+git remote add origin $cloneUrl
+git fetch origin
+echo $githubSha
+git reset --hard $githubSha
+git lfs ls-files --all
+echo ''

dist/remote-builder/combineLFSHash.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo "Combining LFS hash files into one hash, this is used as the cache key:"
+git lfs ls-files -l | cut -d' ' -f1 | sort > $1/lfsSum.txt
+ls -a
+cat $1/lfsSum.txt

dist/remote-builder/handleCaching.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+branchName=$1
+libDir=$2
+purgeRemoteBuilderCache=$3
+
+echo "Checking cache"
+
+# Restore cache
+latest=$(ls -t | head -1)
+if [ ! -z "$latest" ]; then
+  echo "Library cache exists from build $latest from $branchName"
+  echo 'Creating empty Library folder for cache'
+  mkdir $libDir
+  unzip -q $latest -d $libDir
+else
+  echo 'Cache does not exist'
+fi
+
+# purge cache
+if [ "$purgeRemoteBuilderCache" == "true" ]; then
+  rm -r $libDir
+fi
+

dist/remote-builder/setupCache.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+cacheFolderFull=$1
+branchName=$2
+libraryFolderFull=$3
+
+# handle library cache
+if [ ! -d $cacheFolderFull ]; then
+  mkdir $cacheFolderFull
+  echo "creating new cache folder"
+fi
+if [ ! -d $cacheFolderFull/$branchName ]; then
+  mkdir $cacheFolderFull/$branchName
+  echo "creating new cache branch folder for: ${branchName}"
+fi
+echo "Library cache for branch: $branchName"
+ls $cacheFolderFull/$branchName
+echo ''
+
+if [ -d $libraryFolderFull ]; then
+  rm -r $libraryFolderFull
+  echo "Git must ignore the Library folder"
+fi

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

@@ -94,6 +94,12 @@ class RemoteBuilder {
     const repoPathFull = `${buildPathFull}/${repositoryFolder}`;
     const projectPathFull = `${repoPathFull}/${buildParameters.projectPath}`;
     const libraryFolderFull = `${projectPathFull}/Library`;
+
+    const repo = `https://${buildParameters.githubToken}@github.com/game-ci/unity-builder.git`;
+    const repo2 = `https://${buildParameters.githubToken}@github.com/game-ci/steam-deploy.git`;
+    const repo3 = `https://${buildParameters.githubToken}@github.com/${process.env.GITHUB_REPOSITORY}.git`;
+
+    const purgeRemoteCache = process.env.PURGE_REMOTE_BUILDER_CACHE === undefined;
     await this.RemoteBuilderProviderPlatform.runBuildTask(
       buildUid,
       'alpine/git',
@@ -107,58 +113,17 @@ class RemoteBuilder {
           mkdir ${repoPathFull}
           mkdir ${steamPathFull}
           echo "Cloning utility repositories required for building:"
-          git clone -q https://${buildParameters.githubToken}@github.com/game-ci/unity-builder.git ${builderPathFull}
+          git clone -q ${repo} ${builderPathFull}
-          git clone -q https://${buildParameters.githubToken}@github.com/game-ci/steam-deploy.git ${steamPathFull}
+          git clone -q ${repo2} ${steamPathFull}
-          cd ${repoPathFull}
+          ${builderPathFull}/dist/remote-builder/cloneNoLFS.sh
-          # DISABLE LFS
+          ${builderPathFull}/dist/remote-builder/combineLFSHash.sh
-          git config --global filter.lfs.smudge "git-lfs smudge --skip -- %f"
+          ${builderPathFull}/dist/remote-builder/setupCache.sh
-          git config --global filter.lfs.process "git-lfs filter-process --skip"
+          ${builderPathFull}/dist/remote-builder/handleCaching.sh
-          echo ''
+          ${builderPathFull}/dist/remote-builder/cloneNoLFS.sh ${repoPathFull} ${repo3} $GITHUB_SHA
-          echo "Cloning the repository being built:"
+          ${builderPathFull}/dist/remote-builder/combineLFSHash.sh ${repoPathFull}
-          git init -q
+          ${builderPathFull}/dist/remote-builder/setupCache.sh ${cacheFolderFull} ${branchName} ${libraryFolderFull}
-          git remote add origin https://${buildParameters.githubToken}@github.com/${process.env.GITHUB_REPOSITORY}.git
+          ${builderPathFull}/dist/remote-builder/handleCaching.sh ${branchName} ${libraryFolderFull} ${purgeRemoteCache}
-          git fetch origin
+          echo 'Printing out important directories'
-          echo $GITHUB_SHA
-          git reset --hard $GITHUB_SHA
-          git lfs ls-files --all
-          echo ''
-          echo "Combining LFS hash files into one hash, this is used as the cache key:"
-          git lfs ls-files -l | cut -d' ' -f1 | sort > ${repoPathFull}/lfsSum.txt
-          ls -a
-          cat ${repoPathFull}/lfsSum.txt
-          echo '^ checksum'
-          echo ''
-          # time to handle library cache
-          if [ ! -d ${cacheFolderFull} ]; then
-            mkdir ${cacheFolderFull}
-            echo "creating new cache folder"
-          fi
-          if [ ! -d ${cacheFolderFull}/${branchName} ]; then
-            mkdir ${cacheFolderFull}/${branchName}
-            echo "creating new cache branch folder for: ${branchName}"
-          fi
-          echo "Library cache for branch: ${branchName}"
-          ls ${cacheFolderFull}/${branchName}
-          echo ''
-          if [ -d ${libraryFolderFull} ]; then
-            rm -r ${libraryFolderFull}
-            echo "Git must ignore the Library folder"
-          fi
-          echo "Checking cache"
-          # Restore cache
-          latest=$(ls -t | head -1)
-          if [ ! -z "$latest" ]; then
-            echo "Library cache exists from build $latest from ${branchName}"
-            echo 'Creating empty Library folder for cache'
-            mkdir $libDir
-            unzip -q $latest -d $libDir
-            # purge cache
-            ${process.env.PURGE_REMOTE_BUILDER_CACHE === undefined ? '#' : ''} rm -r $libDir
-          else
-            echo 'Cache does not exist'
-          fi
-          # Print out important directories
-          echo ''
           echo 'Repo:'
           ls /${buildVolumeFolder}/${buildUid}/${repositoryFolder}/
           echo ''