fix: use new cli list-resources after cloud pipeline and include k8s in upload artifacts

pull/437/head
Frostebite 2022-10-19 03:22:20 +01:00
parent db793cb31d
commit aacc976238
1 changed files with 8 additions and 12 deletions

View File

@ -31,7 +31,7 @@ env:
jobs: jobs:
localCiPipeline: localCiPipeline:
name: CI Pipeline name: CI Pipeline - Local Stage
if: github.event.pull_request.draft == false if: github.event.pull_request.draft == false
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
@ -79,7 +79,7 @@ jobs:
versioning: None versioning: None
CLOUD_RUNNER_CLUSTER: ${{ matrix.cloudRunnerCluster }} CLOUD_RUNNER_CLUSTER: ${{ matrix.cloudRunnerCluster }}
- uses: ./ - uses: ./
id: aws-fargate-unity-build id: local-unity-build
timeout-minutes: 25 timeout-minutes: 25
with: with:
cloudRunnerCluster: ${{ matrix.cloudRunnerCluster }} cloudRunnerCluster: ${{ matrix.cloudRunnerCluster }}
@ -101,7 +101,7 @@ jobs:
# retention-days: 14 # retention-days: 14
cloudCiPipeline: cloudCiPipeline:
needs: localCiPipeline needs: localCiPipeline
name: CI Pipeline Stage Two name: CI Pipeline - Cloud Stage
if: github.event.pull_request.draft == false if: github.event.pull_request.draft == false
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
@ -158,8 +158,7 @@ jobs:
versioning: None versioning: None
CLOUD_RUNNER_CLUSTER: ${{ matrix.cloudRunnerCluster }} CLOUD_RUNNER_CLUSTER: ${{ matrix.cloudRunnerCluster }}
- uses: ./ - uses: ./
if: ${{ matrix.cloudRunnerCluster != 'k8s' }} id: unity-build
id: aws-fargate-unity-build
timeout-minutes: 25 timeout-minutes: 25
with: with:
cloudRunnerCluster: ${{ matrix.cloudRunnerCluster }} cloudRunnerCluster: ${{ matrix.cloudRunnerCluster }}
@ -168,20 +167,17 @@ jobs:
unityVersion: ${{ matrix.unityVersion }} unityVersion: ${{ matrix.unityVersion }}
targetPlatform: ${{ matrix.targetPlatform }} targetPlatform: ${{ matrix.targetPlatform }}
gitPrivateToken: ${{ secrets.GITHUB_TOKEN }} gitPrivateToken: ${{ secrets.GITHUB_TOKEN }}
customStepFiles: aws-s3-upload-build customStepFiles: aws-s3-upload-build,aws-s3-pull-cache,aws-s3-upload-cache
- run: | - run: |
aws s3 cp s3://game-ci-test-storage/cloud-runner-cache/${{ steps.aws-fargate-unity-build.outputs.CACHE_KEY }}/build-${{ steps.aws-fargate-unity-build.outputs.BUILD_GUID }}.tar.lz4 build-${{ steps.aws-fargate-unity-build.outputs.BUILD_GUID }}.tar.lz4 aws s3 cp s3://game-ci-test-storage/cloud-runner-cache/${{ steps.unity-build.outputs.CACHE_KEY }}/build-${{ steps.unity-build.outputs.BUILD_GUID }}.tar.lz4 build-${{ steps.unity-build.outputs.BUILD_GUID }}.tar.lz4
ls ls
if: ${{ matrix.cloudRunnerCluster != 'k8s' }} - run: yarn run cli -m list-resources
- run: yarn run cli -m aws-list-all
if: ${{ matrix.cloudRunnerCluster == 'aws' }}
########################### ###########################
# Upload # # Upload #
########################### ###########################
# download from cloud storage # download from cloud storage
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
if: ${{ matrix.cloudRunnerCluster != 'k8s' }}
with: with:
name: AWS Build (${{ matrix.targetPlatform }}) name: AWS Build (${{ matrix.targetPlatform }})
path: build-${{ steps.aws-fargate-unity-build.outputs.BUILD_GUID }}.tar.lz4 path: build-${{ steps.unity-build.outputs.BUILD_GUID }}.tar.lz4
retention-days: 14 retention-days: 14