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

Do not wait for ttl shutdown

pull/235/head
mdugdale 2021-04-03 00:06:47 +01:00
parent c7417caf05
commit 9e232ed4e9
3 changed files with 9 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dist/index.js vendored
View File

@ -247,55 +247,6 @@ class AWS {
ParameterValue: buildParameters.githubToken,
},
]);
yield this.run(buildUid, buildParameters.awsStackName, 'alpine', ['/bin/sh'], [
'-c',
`
apk update;
apk add zip
zip -r ./${buildUid}/output.zip ./${buildUid}/repo/build
ls
`,
], '/data', '/data/', [
{
name: 'GITHUB_SHA',
value: process.env.GITHUB_SHA,
},
], [
{
ParameterKey: 'GithubToken',
ParameterValue: buildParameters.githubToken,
},
]);
yield this.run(buildUid, buildParameters.awsStackName, 'amazon/aws-cli', ['/bin/sh'], [
'-c',
`
aws s3 cp ./${buildUid}/output.zip s3://game-ci-storage/${buildUid}
rm -r ${buildUid}
ls
`,
], '/data', '/data/', [
{
name: 'GITHUB_SHA',
value: process.env.GITHUB_SHA,
},
{
name: 'AWS_DEFAULT_REGION',
value: process.env.AWS_DEFAULT_REGION,
},
], [
{
ParameterKey: 'GithubToken',
ParameterValue: buildParameters.githubToken,
},
{
ParameterKey: 'AWSAccessKeyID',
ParameterValue: process.env.AWS_ACCESS_KEY_ID,
},
{
ParameterKey: 'AWSSecretAccessKey',
ParameterValue: process.env.AWS_SECRET_ACCESS_KEY,
},
]);
yield this.run(buildUid, buildParameters.awsStackName, baseImage.toString(), ['/bin/sh'], [
'-c',
`
@ -640,9 +591,10 @@ class AWS {
yield CF.waitFor('stackDeleteComplete', {
StackName: taskDefStackName,
}).promise();
yield CF.waitFor('stackDeleteComplete', {
StackName: taskDefStackNameTTL,
}).promise();
// Currently too slow and causes too much waiting
// await CF.waitFor('stackDeleteComplete', {
// StackName: taskDefStackNameTTL,
// }).promise();
core.info('Cleanup complete');
});
}

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

7
src/model/aws.ts
View File

@ -452,9 +452,10 @@ class AWS {
StackName: taskDefStackName,
}).promise();
await CF.waitFor('stackDeleteComplete', {
StackName: taskDefStackNameTTL,
}).promise();
// Currently too slow and causes too much waiting
// await CF.waitFor('stackDeleteComplete', {
// StackName: taskDefStackNameTTL,
// }).promise();
core.info('Cleanup complete');
}