From 4c480f61d6c6ac7da51b572e28c141a7fb5e89d4 Mon Sep 17 00:00:00 2001
From: Frostebite <jas.f.ukcmti@gmail.com>
Date: Sun, 2 Jan 2022 05:25:51 +0000
Subject: [PATCH] Caching cleanup

---
 .../workflows/cloud-runner-aws-pipeline.yml   |  1 -
 .../workflows/cloud-runner-k8s-pipeline.yml   | 31 +++++++++++++++++++
 src/model/cloud-runner/cloud-runner.test.ts   |  2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cloud-runner-aws-pipeline.yml b/.github/workflows/cloud-runner-aws-pipeline.yml
index d5f30fd2..d115b54d 100644
--- a/.github/workflows/cloud-runner-aws-pipeline.yml
+++ b/.github/workflows/cloud-runner-aws-pipeline.yml
@@ -68,7 +68,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           AWS_BASE_STACK_NAME: game-ci-stack-integration-tests
           CLOUD_RUNNER_TESTS: true
-      - run: aws s3 ls
       - uses: ./
         id: aws-fargate-unity-build
         env:
diff --git a/.github/workflows/cloud-runner-k8s-pipeline.yml b/.github/workflows/cloud-runner-k8s-pipeline.yml
index 1aa157b3..a3cb63aa 100644
--- a/.github/workflows/cloud-runner-k8s-pipeline.yml
+++ b/.github/workflows/cloud-runner-k8s-pipeline.yml
@@ -109,3 +109,34 @@ jobs:
           unityVersion: 2019.3.15f1
           versioning: None
           cloudRunnerTests: true
+          postBuildSteps: |
+            - name: upload
+              image: amazon/aws-cli
+              commands: |
+                aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
+                aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
+                aws configure set region $AWS_DEFAULT_REGION --profile default
+                aws s3 ls
+                aws s3 ls game-ci-test-storage
+                ls /data/cache/$BRANCH
+                echo "/data/cache/$BRANCH/build-$BUILD_GUID.zip s3://game-ci-test-storage/$BRANCH/$BUILD_FILE"
+                aws s3 cp /data/cache/$BRANCH/build-$BUILD_GUID.zip s3://game-ci-test-storage/$BRANCH/build-$BUILD_GUID.zip
+              secrets:
+              - name: awsAccessKeyId
+                value: ${{ secrets.AWS_ACCESS_KEY_ID }}
+              - name: awsSecretAccessKey
+                value: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+              - name: awsDefaultRegion
+                value: eu-west-2
+      - run: |
+          aws s3 cp s3://game-ci-test-storage/${{ steps.aws-fargate-unity-build.outputs.BRANCH }}/build-${{ steps.aws-fargate-unity-build.outputs.BUILD_GUID }}.zip build-${{ steps.aws-fargate-unity-build.outputs.BUILD_GUID }}.zip
+          ls
+      ###########################
+      #          Upload         #
+      ###########################
+      # download from cloud storage
+      - uses: actions/upload-artifact@v2
+        with:
+          name: K8s Build (${{ matrix.targetPlatform }})
+          path: build-${{ steps.k8s-unity-build.outputs.BUILD_GUID }}.zip
+          retention-days: 14
diff --git a/src/model/cloud-runner/cloud-runner.test.ts b/src/model/cloud-runner/cloud-runner.test.ts
index c3e41f53..0570337e 100644
--- a/src/model/cloud-runner/cloud-runner.test.ts
+++ b/src/model/cloud-runner/cloud-runner.test.ts
@@ -26,6 +26,7 @@ describe('Cloud Runner', () => {
   };
   if (Input.cloudRunnerTests) {
     it('All build parameters sent to cloud runner as env vars', async () => {
+      Input.githubInputEnabled = false;
       const buildParameter = await BuildParameters.create();
       const baseImage = new ImageTag(buildParameter);
       const file = await CloudRunner.run(buildParameter, baseImage.toString());
@@ -43,6 +44,7 @@ describe('Cloud Runner', () => {
           expect(newLinePurgedFile).toContain(`${element.name}=${element.value}`);
         }
       }
+      Input.githubInputEnabled = true;
     }, 1000000);
   }
 });