cleanup
parent
92e15f0972
commit
31df8abf88
|
|
@ -236,7 +236,6 @@ class AWS {
|
||||||
apk add git-lfs;
|
apk add git-lfs;
|
||||||
apk add jq;
|
apk add jq;
|
||||||
|
|
||||||
ls;
|
|
||||||
git clone -q https://${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_REPOSITORY}.git ${buildUid}/repo;
|
git clone -q https://${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_REPOSITORY}.git ${buildUid}/repo;
|
||||||
git clone -q https://${process.env.GITHUB_TOKEN}@github.com/game-ci/unity-builder.git ${buildUid}/builder;
|
git clone -q https://${process.env.GITHUB_TOKEN}@github.com/game-ci/unity-builder.git ${buildUid}/builder;
|
||||||
|
|
||||||
|
|
@ -251,7 +250,7 @@ class AWS {
|
||||||
cd "${branchName}"
|
cd "${branchName}"
|
||||||
|
|
||||||
echo ' '
|
echo ' '
|
||||||
echo 'Cached Libraries for ${branchName}'
|
echo 'Cached Libraries for ${branchName} from previous builds:'
|
||||||
ls
|
ls
|
||||||
echo ' '
|
echo ' '
|
||||||
|
|
||||||
|
|
@ -379,7 +378,7 @@ class AWS {
|
||||||
apk update;
|
apk update;
|
||||||
apk add zip
|
apk add zip
|
||||||
zip -r -o ./cache/${branchName}/lib-${buildUid}.zip ./${buildUid}/repo/Library/*
|
zip -r -o ./cache/${branchName}/lib-${buildUid}.zip ./${buildUid}/repo/Library/*
|
||||||
zip -r -o ./build-${buildUid}.zip ./${buildUid}/repo/build/*
|
zip -r -o ./${buildUid}/build-${buildUid}.zip ./${buildUid}/repo/build/*
|
||||||
ls
|
ls
|
||||||
`,
|
`,
|
||||||
], '/data', '/data/', [
|
], '/data', '/data/', [
|
||||||
|
|
@ -397,7 +396,7 @@ class AWS {
|
||||||
yield this.run(buildUid, buildParameters.awsStackName, 'amazon/aws-cli', ['/bin/sh'], [
|
yield this.run(buildUid, buildParameters.awsStackName, 'amazon/aws-cli', ['/bin/sh'], [
|
||||||
'-c',
|
'-c',
|
||||||
`
|
`
|
||||||
aws s3 cp ./build-${buildUid}.zip s3://game-ci-storage/
|
aws s3 cp ./${buildUid}/build-${buildUid}.zip s3://game-ci-storage/
|
||||||
aws s3 cp ./cache/${branchName}/lib-${buildUid}.zip s3://game-ci-storage/
|
aws s3 cp ./cache/${branchName}/lib-${buildUid}.zip s3://game-ci-storage/
|
||||||
rm -r ${buildUid}
|
rm -r ${buildUid}
|
||||||
ls
|
ls
|
||||||
|
|
@ -519,7 +518,8 @@ class AWS {
|
||||||
StackName: taskDefStackName,
|
StackName: taskDefStackName,
|
||||||
}).promise();
|
}).promise();
|
||||||
const baseResources = yield CF.describeStackResources({ StackName: stackName }).promise();
|
const baseResources = yield CF.describeStackResources({ StackName: stackName }).promise();
|
||||||
core.info('Build cluster created successfully (skipping wait for cleanup cluster to create)');
|
// in the future we should offer a parameter to choose if you want the guarnteed shutdown.
|
||||||
|
core.info('Build cluster created successfully (skipping wait for cleanup cluster to be ready)');
|
||||||
return {
|
return {
|
||||||
taskDefStackName,
|
taskDefStackName,
|
||||||
taskDefCloudFormation,
|
taskDefCloudFormation,
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -23,7 +23,6 @@ class AWS {
|
||||||
apk add git-lfs;
|
apk add git-lfs;
|
||||||
apk add jq;
|
apk add jq;
|
||||||
|
|
||||||
ls;
|
|
||||||
git clone -q https://${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_REPOSITORY}.git ${buildUid}/repo;
|
git clone -q https://${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_REPOSITORY}.git ${buildUid}/repo;
|
||||||
git clone -q https://${process.env.GITHUB_TOKEN}@github.com/game-ci/unity-builder.git ${buildUid}/builder;
|
git clone -q https://${process.env.GITHUB_TOKEN}@github.com/game-ci/unity-builder.git ${buildUid}/builder;
|
||||||
|
|
||||||
|
|
@ -38,7 +37,7 @@ class AWS {
|
||||||
cd "${branchName}"
|
cd "${branchName}"
|
||||||
|
|
||||||
echo ' '
|
echo ' '
|
||||||
echo 'Cached Libraries for ${branchName}'
|
echo 'Cached Libraries for ${branchName} from previous builds:'
|
||||||
ls
|
ls
|
||||||
echo ' '
|
echo ' '
|
||||||
|
|
||||||
|
|
@ -187,7 +186,7 @@ class AWS {
|
||||||
apk update;
|
apk update;
|
||||||
apk add zip
|
apk add zip
|
||||||
zip -r -o ./cache/${branchName}/lib-${buildUid}.zip ./${buildUid}/repo/Library/*
|
zip -r -o ./cache/${branchName}/lib-${buildUid}.zip ./${buildUid}/repo/Library/*
|
||||||
zip -r -o ./build-${buildUid}.zip ./${buildUid}/repo/build/*
|
zip -r -o ./${buildUid}/build-${buildUid}.zip ./${buildUid}/repo/build/*
|
||||||
ls
|
ls
|
||||||
`,
|
`,
|
||||||
],
|
],
|
||||||
|
|
@ -216,7 +215,7 @@ class AWS {
|
||||||
[
|
[
|
||||||
'-c',
|
'-c',
|
||||||
`
|
`
|
||||||
aws s3 cp ./build-${buildUid}.zip s3://game-ci-storage/
|
aws s3 cp ./${buildUid}/build-${buildUid}.zip s3://game-ci-storage/
|
||||||
aws s3 cp ./cache/${branchName}/lib-${buildUid}.zip s3://game-ci-storage/
|
aws s3 cp ./cache/${branchName}/lib-${buildUid}.zip s3://game-ci-storage/
|
||||||
rm -r ${buildUid}
|
rm -r ${buildUid}
|
||||||
ls
|
ls
|
||||||
|
|
@ -376,7 +375,8 @@ class AWS {
|
||||||
|
|
||||||
const baseResources = await CF.describeStackResources({ StackName: stackName }).promise();
|
const baseResources = await CF.describeStackResources({ StackName: stackName }).promise();
|
||||||
|
|
||||||
core.info('Build cluster created successfully (skipping wait for cleanup cluster to create)');
|
// in the future we should offer a parameter to choose if you want the guarnteed shutdown.
|
||||||
|
core.info('Build cluster created successfully (skipping wait for cleanup cluster to be ready)');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
taskDefStackName,
|
taskDefStackName,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue