actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes

pull/524/head
Frostebite 2023-03-18 14:25:27 +00:00
parent 8ed7856378
commit 6c66e08369
3 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
dist/index.js vendored
View File

@ -4571,8 +4571,8 @@ class CloudRunnerCustomSteps {
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default 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 aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $AWS_DEFAULT_REGION --profile default
aws s3 cp /data/cache/$CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.useLz4Compression ? '.lz4' : ''} s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/build/build-$BUILD_GUID.tar${cloud_runner_1.default.buildParameters.useLz4Compression ? '.lz4' : ''} aws s3 cp /data/cache/$CI_CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.useLz4Compression ? '.lz4' : ''} s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID.tar${cloud_runner_1.default.buildParameters.useLz4Compression ? '.lz4' : ''}
rm /data/cache/$CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.useLz4Compression ? '.lz4' : ''} rm /data/cache/$CI_CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.useLz4Compression ? '.lz4' : ''}
secrets: secrets:
- name: awsAccessKeyId - name: awsAccessKeyId
value: ${process.env.AWS_ACCESS_KEY_ID || ``} value: ${process.env.AWS_ACCESS_KEY_ID || ``}
@ -4583,16 +4583,16 @@ class CloudRunnerCustomSteps {
- name: aws-s3-pull-build - name: aws-s3-pull-build
image: amazon/aws-cli image: amazon/aws-cli
commands: | commands: |
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true
aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/build || true aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/build || true
aws s3 cp s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.useLz4Compression ? '.lz4' : ''} /data/cache/$CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.useLz4Compression ? '.lz4' : ''} aws s3 cp s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.useLz4Compression ? '.lz4' : ''} /data/cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.useLz4Compression ? '.lz4' : ''}
secrets: secrets:
- name: awsAccessKeyId - name: CI_AWS_ACCESS_KEY_ID
- name: awsSecretAccessKey - name: CI_AWS_SECRET_ACCESS_KEY
- name: awsDefaultRegion - name: CI_AWS_DEFAULT_REGION
- name: BUILD_GUID_TARGET - name: BUILD_GUID_TARGET
- name: steam-deploy-client - name: steam-deploy-client
image: steamcmd/steamcmd image: steamcmd/steamcmd
@ -4634,43 +4634,43 @@ class CloudRunnerCustomSteps {
image: amazon/aws-cli image: amazon/aws-cli
hook: after hook: after
commands: | commands: |
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 cp --recursive /data/cache/$CACHE_KEY/lfs s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/lfs aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/lfs s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/lfs
rm -r /data/cache/$CACHE_KEY/lfs rm -r /data/cache/$CI_CACHE_KEY/lfs
aws s3 cp --recursive /data/cache/$CACHE_KEY/Library s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/Library aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/Library s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/Library
rm -r /data/cache/$CACHE_KEY/Library rm -r /data/cache/$CI_CACHE_KEY/Library
secrets: secrets:
- name: awsAccessKeyId - name: CI_AWS_ACCESS_KEY_ID
value: ${process.env.AWS_ACCESS_KEY_ID || ``} value: ${process.env.AWS_ACCESS_KEY_ID || ``}
- name: awsSecretAccessKey - name: CI_AWS_SECRET_ACCESS_KEY
value: ${process.env.AWS_SECRET_ACCESS_KEY || ``} value: ${process.env.AWS_SECRET_ACCESS_KEY || ``}
- name: awsDefaultRegion - name: CI_AWS_DEFAULT_REGION
value: ${process.env.AWS_REGION || ``} value: ${process.env.AWS_REGION || ``}
- name: aws-s3-pull-cache - name: aws-s3-pull-cache
image: amazon/aws-cli image: amazon/aws-cli
hook: before hook: before
commands: | commands: |
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true
aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/ || true aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/ || true
BUCKET1="${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/Library/" BUCKET1="${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/Library/"
aws s3 ls $BUCKET1 || true aws s3 ls $BUCKET1 || true
OBJECT1="$(aws s3 ls $BUCKET1 | sort | tail -n 1 | awk '{print $4}' || '')" OBJECT1="$(aws s3 ls $BUCKET1 | sort | tail -n 1 | awk '{print $4}' || '')"
aws s3 cp s3://$BUCKET1$OBJECT1 /data/cache/$CACHE_KEY/Library/ || true aws s3 cp s3://$BUCKET1$OBJECT1 /data/cache/$CI_CACHE_KEY/Library/ || true
BUCKET2="${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/lfs/" BUCKET2="${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/lfs/"
aws s3 ls $BUCKET2 || true aws s3 ls $BUCKET2 || true
OBJECT2="$(aws s3 ls $BUCKET2 | sort | tail -n 1 | awk '{print $4}' || '')" OBJECT2="$(aws s3 ls $BUCKET2 | sort | tail -n 1 | awk '{print $4}' || '')"
aws s3 cp s3://$BUCKET2$OBJECT2 /data/cache/$CACHE_KEY/lfs/ || true aws s3 cp s3://$BUCKET2$OBJECT2 /data/cache/$CI_CACHE_KEY/lfs/ || true
secrets: secrets:
- name: awsAccessKeyId - name: CI_AWS_ACCESS_KEY_ID
value: ${process.env.AWS_ACCESS_KEY_ID || ``} value: ${process.env.AWS_ACCESS_KEY_ID || ``}
- name: awsSecretAccessKey - name: CI_AWS_SECRET_ACCESS_KEY
value: ${process.env.AWS_SECRET_ACCESS_KEY || ``} value: ${process.env.AWS_SECRET_ACCESS_KEY || ``}
- name: awsDefaultRegion - name: CI_AWS_DEFAULT_REGION
value: ${process.env.AWS_REGION || ``} value: ${process.env.AWS_REGION || ``}
- name: debug-cache - name: debug-cache
image: ubuntu image: ubuntu

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

72
src/model/cloud-runner/services/cloud-runner-custom-steps.ts
View File

@ -45,12 +45,14 @@ export class CloudRunnerCustomSteps {
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default 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 aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $AWS_DEFAULT_REGION --profile default
aws s3 cp /data/cache/$CACHE_KEY/build/build-${CloudRunner.buildParameters.buildGuid}.tar${ aws s3 cp /data/cache/$CI_CACHE_KEY/build/build-${CloudRunner.buildParameters.buildGuid}.tar${
CloudRunner.buildParameters.useLz4Compression ? '.lz4' : '' CloudRunner.buildParameters.useLz4Compression ? '.lz4' : ''
} s3://${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/build/build-$BUILD_GUID.tar${ } s3://${
CloudRunner.buildParameters.awsBaseStackName
}/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID.tar${
CloudRunner.buildParameters.useLz4Compression ? '.lz4' : '' CloudRunner.buildParameters.useLz4Compression ? '.lz4' : ''
} }
rm /data/cache/$CACHE_KEY/build/build-${CloudRunner.buildParameters.buildGuid}.tar${ rm /data/cache/$CI_CACHE_KEY/build/build-${CloudRunner.buildParameters.buildGuid}.tar${
CloudRunner.buildParameters.useLz4Compression ? '.lz4' : '' CloudRunner.buildParameters.useLz4Compression ? '.lz4' : ''
} }
secrets: secrets:
@ -63,22 +65,22 @@ export class CloudRunnerCustomSteps {
- name: aws-s3-pull-build - name: aws-s3-pull-build
image: amazon/aws-cli image: amazon/aws-cli
commands: | commands: |
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true
aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/build || true aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/build || true
aws s3 cp s3://${ aws s3 cp s3://${
CloudRunner.buildParameters.awsBaseStackName CloudRunner.buildParameters.awsBaseStackName
}/cloud-runner-cache/$CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${ }/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${
CloudRunner.buildParameters.useLz4Compression ? '.lz4' : '' CloudRunner.buildParameters.useLz4Compression ? '.lz4' : ''
} /data/cache/$CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${ } /data/cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${
CloudRunner.buildParameters.useLz4Compression ? '.lz4' : '' CloudRunner.buildParameters.useLz4Compression ? '.lz4' : ''
} }
secrets: secrets:
- name: awsAccessKeyId - name: CI_AWS_ACCESS_KEY_ID
- name: awsSecretAccessKey - name: CI_AWS_SECRET_ACCESS_KEY
- name: awsDefaultRegion - name: CI_AWS_DEFAULT_REGION
- name: BUILD_GUID_TARGET - name: BUILD_GUID_TARGET
- name: steam-deploy-client - name: steam-deploy-client
image: steamcmd/steamcmd image: steamcmd/steamcmd
@ -120,47 +122,47 @@ export class CloudRunnerCustomSteps {
image: amazon/aws-cli image: amazon/aws-cli
hook: after hook: after
commands: | commands: |
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 cp --recursive /data/cache/$CACHE_KEY/lfs s3://${ aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/lfs s3://${
CloudRunner.buildParameters.awsBaseStackName CloudRunner.buildParameters.awsBaseStackName
}/cloud-runner-cache/$CACHE_KEY/lfs }/cloud-runner-cache/$CI_CACHE_KEY/lfs
rm -r /data/cache/$CACHE_KEY/lfs rm -r /data/cache/$CI_CACHE_KEY/lfs
aws s3 cp --recursive /data/cache/$CACHE_KEY/Library s3://${ aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/Library s3://${
CloudRunner.buildParameters.awsBaseStackName CloudRunner.buildParameters.awsBaseStackName
}/cloud-runner-cache/$CACHE_KEY/Library }/cloud-runner-cache/$CI_CACHE_KEY/Library
rm -r /data/cache/$CACHE_KEY/Library rm -r /data/cache/$CI_CACHE_KEY/Library
secrets: secrets:
- name: awsAccessKeyId - name: CI_AWS_ACCESS_KEY_ID
value: ${process.env.AWS_ACCESS_KEY_ID || ``} value: ${process.env.AWS_ACCESS_KEY_ID || ``}
- name: awsSecretAccessKey - name: CI_AWS_SECRET_ACCESS_KEY
value: ${process.env.AWS_SECRET_ACCESS_KEY || ``} value: ${process.env.AWS_SECRET_ACCESS_KEY || ``}
- name: awsDefaultRegion - name: CI_AWS_DEFAULT_REGION
value: ${process.env.AWS_REGION || ``} value: ${process.env.AWS_REGION || ``}
- name: aws-s3-pull-cache - name: aws-s3-pull-cache
image: amazon/aws-cli image: amazon/aws-cli
hook: before hook: before
commands: | commands: |
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true
aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/ || true aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/ || true
BUCKET1="${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/Library/" BUCKET1="${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/Library/"
aws s3 ls $BUCKET1 || true aws s3 ls $BUCKET1 || true
OBJECT1="$(aws s3 ls $BUCKET1 | sort | tail -n 1 | awk '{print $4}' || '')" OBJECT1="$(aws s3 ls $BUCKET1 | sort | tail -n 1 | awk '{print $4}' || '')"
aws s3 cp s3://$BUCKET1$OBJECT1 /data/cache/$CACHE_KEY/Library/ || true aws s3 cp s3://$BUCKET1$OBJECT1 /data/cache/$CI_CACHE_KEY/Library/ || true
BUCKET2="${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CACHE_KEY/lfs/" BUCKET2="${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/lfs/"
aws s3 ls $BUCKET2 || true aws s3 ls $BUCKET2 || true
OBJECT2="$(aws s3 ls $BUCKET2 | sort | tail -n 1 | awk '{print $4}' || '')" OBJECT2="$(aws s3 ls $BUCKET2 | sort | tail -n 1 | awk '{print $4}' || '')"
aws s3 cp s3://$BUCKET2$OBJECT2 /data/cache/$CACHE_KEY/lfs/ || true aws s3 cp s3://$BUCKET2$OBJECT2 /data/cache/$CI_CACHE_KEY/lfs/ || true
secrets: secrets:
- name: awsAccessKeyId - name: CI_AWS_ACCESS_KEY_ID
value: ${process.env.AWS_ACCESS_KEY_ID || ``} value: ${process.env.AWS_ACCESS_KEY_ID || ``}
- name: awsSecretAccessKey - name: CI_AWS_SECRET_ACCESS_KEY
value: ${process.env.AWS_SECRET_ACCESS_KEY || ``} value: ${process.env.AWS_SECRET_ACCESS_KEY || ``}
- name: awsDefaultRegion - name: CI_AWS_DEFAULT_REGION
value: ${process.env.AWS_REGION || ``} value: ${process.env.AWS_REGION || ``}
- name: debug-cache - name: debug-cache
image: ubuntu image: ubuntu