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

cleanup

pull/437/head
Frostebite 2022-10-14 23:58:32 +01:00
parent 42e1a2a4a5
commit e98e48e159
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/index.js vendored
View File

@ -4445,12 +4445,11 @@ class CloudRunnerCustomSteps {
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default
BUCKET1="game-ci-test-storage/$CACHE_KEY/Library"
aws s3 ls s3://$BUCKET1/ || exit 0
OBJECT1="$(aws s3 ls $BUCKET1 --recursive | sort | tail -n 1 | awk '{print $4}')"
aws s3 cp s3://$BUCKET1/$OBJECT1 /data/cache/$CACHE_KEY/Library/
aws s3 cp s3://$BUCKET1/$OBJECT1 /data/cache/$CACHE_KEY/Library/$OBJECT1
BUCKET2="game-ci-test-storage/$CACHE_KEY/lfs"
OBJECT2="$(aws s3 ls $BUCKET2 --recursive | sort | tail -n 1 | awk '{print $4}')"
aws s3 cp s3://$BUCKET2/$OBJECT2 /data/cache/$CACHE_KEY/lfs/
aws s3 cp s3://$BUCKET2/$OBJECT2 /data/cache/$CACHE_KEY/lfs/$OBJECT2
secrets:
- name: awsAccessKeyId
value: ${process.env.AWS_ACCESS_KEY_ID || ``}
@ -4578,7 +4577,7 @@ class CloudRunnerFolders {
}
// Only the following paths that do not start a path.join with another "Full" suffixed property need to start with an absolute /
static get uniqueCloudRunnerJobFolderAbsolute() {
return cloud_runner_1.default.buildParameters.retainWorkspace && cloud_runner_1.default.lockedWorkspace
return cloud_runner_1.default.buildParameters && cloud_runner_1.default.buildParameters.retainWorkspace && cloud_runner_1.default.lockedWorkspace
? path_1.default.join(`/`, CloudRunnerFolders.buildVolumeFolder, cloud_runner_1.default.lockedWorkspace)
: path_1.default.join(`/`, CloudRunnerFolders.buildVolumeFolder, cloud_runner_1.default.buildParameters.buildGuid);
}

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -73,12 +73,11 @@ export class CloudRunnerCustomSteps {
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default
BUCKET1="game-ci-test-storage/$CACHE_KEY/Library"
aws s3 ls s3://$BUCKET1/ || exit 0
OBJECT1="$(aws s3 ls $BUCKET1 --recursive | sort | tail -n 1 | awk '{print $4}')"
aws s3 cp s3://$BUCKET1/$OBJECT1 /data/cache/$CACHE_KEY/Library/
aws s3 cp s3://$BUCKET1/$OBJECT1 /data/cache/$CACHE_KEY/Library/$OBJECT1
BUCKET2="game-ci-test-storage/$CACHE_KEY/lfs"
OBJECT2="$(aws s3 ls $BUCKET2 --recursive | sort | tail -n 1 | awk '{print $4}')"
aws s3 cp s3://$BUCKET2/$OBJECT2 /data/cache/$CACHE_KEY/lfs/
aws s3 cp s3://$BUCKET2/$OBJECT2 /data/cache/$CACHE_KEY/lfs/$OBJECT2
secrets:
- name: awsAccessKeyId
value: ${process.env.AWS_ACCESS_KEY_ID || ``}

2
src/model/cloud-runner/services/cloud-runner-folders.ts
View File

@ -11,7 +11,7 @@ export class CloudRunnerFolders {
// Only the following paths that do not start a path.join with another "Full" suffixed property need to start with an absolute /
public static get uniqueCloudRunnerJobFolderAbsolute(): string {
return CloudRunner.buildParameters.retainWorkspace && CloudRunner.lockedWorkspace
return CloudRunner.buildParameters && CloudRunner.buildParameters.retainWorkspace && CloudRunner.lockedWorkspace
? path.join(`/`, CloudRunnerFolders.buildVolumeFolder, CloudRunner.lockedWorkspace)
: path.join(`/`, CloudRunnerFolders.buildVolumeFolder, CloudRunner.buildParameters.buildGuid);
}