cleanup

dist/bootstrapper/SetupRepoCloud.sh

@@ -1,66 +0,0 @@
-apk update
-apk add unzip
-apk add git-lfs
-apk add jq
-
-GITHUB_TOKEN=$1
-GITHUB_REPO=$2
-BUILD_ID=$3
-REPO_PATH_NAME=$4
-EFS_PATH_NAME=$5
-CACHE_PATH_NAME=$6
-BRANCH_NAME=$7
-
-
-# Get source repo for project to be built and game-ci repo for utilties
-git clone https://$GITHUB_TOKEN@github.com/$GITHUB_REPO.git $BUILD_ID/$REPO_PATH_NAME -q
-git clone https://$GITHUB_TOKEN@github.com/game-ci/unity-builder.git $BUILD_ID/builder -q
-
-cd /$EFS_PATH_NAME/$BUILD_ID/$REPO_PATH_NAME/
-git checkout $GITHUB_SHA
-cd /$EFS_PATH_NAME/
-
-# Look for usable cache
-if [ ! -d $CACHE_PATH_NAME ]; then
-    mkdir $CACHE_PATH_NAME
-fi
-    cd $CACHE_PATH_NAME
-if [ ! -d "$BRANCH_NAME" ]; then
-    mkdir "$BRANCH_NAME"
-fi
-cd "$BRANCH_NAME"
-echo ' '
-echo "Cached Libraries for $BRANCH_NAME from previous builds:"
-ls
-echo ' '
-libDir=/${efsDirectoryName}/$BUILD_ID/$REPO_PATH_NAME/${buildParameters.projectPath}/Library
-
-if [ -d "$libDir"  ]; then
-    echo "Library folder already present, make sure you setup .gitignore correctly"
-    echo "Cleaning out Library folder for this build"
-    rm -r "$libDir"
-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/."
-else
-    echo "Cache does not exist"
-fi
-
-# Print out important directories
-echo ' '
-echo 'Repo:'
-ls /${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/
-echo ' '
-echo 'Project:'
-ls /${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}
-echo ' '
-echo 'Library:'
-ls /${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}/Library/
-echo ' '

dist/index.js

@@ -262,17 +262,17 @@ class AWS {
           echo " "
           libDir="/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}/Library"
           if [ -d "$libDir"  ]; then
-          echo "Library folder already present, make sure you setup .gitignore correctly"
+            echo "Library folder already present, make sure you setup .gitignore correctly"
-          echo "Cleaning out Library folder for this build"
+            echo "Cleaning out Library folder for this build"
-          rm -r "$libDir"
+            rm -r "$libDir"
           fi
           echo 'Checking cache'
           # Restore cache
           latest=$(ls -t | head -1)
-          if [ ! -z '$latest' ]; then
+          if [ ! -z "$latest" ]; then
             echo 'Library cache exists from build $latest from ${branchName}'
             echo 'Creating empty Library folder for cache'
-            mkdir '$libDir'
+            mkdir "$libDir"
             unzip -q '$latest' -d '/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}/Library/.'
           else
             echo 'Cache does not exist'
@@ -470,7 +470,7 @@ class AWS {
       echo "${logid}"
     `;
             const taskDefStackName = `${stackName}-${buildUid}`;
-            const taskDefCloudFormation = fs.readFileSync(`${__dirname}/task-def-formation.yml`, 'utf8');
+            const taskDefCloudFormation = fs.readFileSync(`${__dirname}/cloud-formations/task-def-formation.yml`, 'utf8');
             yield CF.createStack({
                 StackName: taskDefStackName,
                 TemplateBody: taskDefCloudFormation,
@@ -508,7 +508,7 @@ class AWS {
             }).promise();
             core.info('Creating worker cluster...');
             const cleanupTaskDefStackName = `${taskDefStackName}-cleanup`;
-            const cleanupCloudFormation = fs.readFileSync(`${__dirname}/cloudformation-stack-ttl.yml`, 'utf8');
+            const cleanupCloudFormation = fs.readFileSync(`${__dirname}/cloud-formations/cloudformation-stack-ttl.yml`, 'utf8');
             yield CF.createStack({
                 StackName: cleanupTaskDefStackName,
                 TemplateBody: cleanupCloudFormation,

src/model/aws.ts

@@ -50,9 +50,9 @@ class AWS {
           echo " "
           libDir="/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}/Library"
           if [ -d "$libDir"  ]; then
-          echo "Library folder already present, make sure you setup .gitignore correctly"
+            echo "Library folder already present, make sure you setup .gitignore correctly"
-          echo "Cleaning out Library folder for this build"
+            echo "Cleaning out Library folder for this build"
-          rm -r "$libDir"
+            rm -r "$libDir"
           fi
           echo 'Checking cache'
           # Restore cache
@@ -325,7 +325,7 @@ class AWS {
       echo "${logid}"
     `;
     const taskDefStackName = `${stackName}-${buildUid}`;
-    const taskDefCloudFormation = fs.readFileSync(`${__dirname}/task-def-formation.yml`, 'utf8');
+    const taskDefCloudFormation = fs.readFileSync(`${__dirname}/cloud-formations/task-def-formation.yml`, 'utf8');
     await CF.createStack({
       StackName: taskDefStackName,
       TemplateBody: taskDefCloudFormation,
@@ -364,7 +364,7 @@ class AWS {
     core.info('Creating worker cluster...');
 
     const cleanupTaskDefStackName = `${taskDefStackName}-cleanup`;
-    const cleanupCloudFormation = fs.readFileSync(`${__dirname}/cloudformation-stack-ttl.yml`, 'utf8');
+    const cleanupCloudFormation = fs.readFileSync(`${__dirname}/cloud-formations/cloudformation-stack-ttl.yml`, 'utf8');
     await CF.createStack({
       StackName: cleanupTaskDefStackName,
       TemplateBody: cleanupCloudFormation,