pull/289/head
mdugdale 2021-08-22 00:29:27 +01:00
parent 7034f51d93
commit 901eaaf581
3 changed files with 17 additions and 54 deletions

34
dist/index.js vendored
View File

@ -1150,18 +1150,6 @@ class CloudRunner {
}, },
]; ];
} }
static readUploadArtifactEnvironmentVariables() {
return [
{
name: 'GITHUB_SHA',
value: process.env.GITHUB_SHA || '',
},
{
name: 'AWS_DEFAULT_REGION',
value: process.env.AWS_DEFAULT_REGION || '',
},
];
}
static runMainJob(baseImage) { static runMainJob(baseImage) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
if (!this.buildParams.customBuildSteps) { if (!this.buildParams.customBuildSteps) {
@ -1199,12 +1187,7 @@ class CloudRunner {
}; };
return secret; return secret;
}); });
yield this.CloudRunnerProviderPlatform.runBuildTask(this.buildGuid, step['image'], step['commands'], `/${buildVolumeFolder}`, `/${buildVolumeFolder}`, [ yield this.CloudRunnerProviderPlatform.runBuildTask(this.buildGuid, step['image'], step['commands'], `/${buildVolumeFolder}`, `/${buildVolumeFolder}`, this.defaultGitShaEnvironmentVariable, [...this.defaultSecrets, ...stepSecrets]);
{
name: 'GITHUB_SHA',
value: process.env.GITHUB_SHA || '',
},
], [...this.defaultSecrets, ...stepSecrets]);
} }
}); });
} }
@ -1285,14 +1268,13 @@ class CloudRunner {
${process.env.DEBUG ? '' : '#'}ls -lh "$repoPathFull" ${process.env.DEBUG ? '' : '#'}ls -lh "$repoPathFull"
`, `,
], `/${buildVolumeFolder}`, `/${buildVolumeFolder}`, [ ], `/${buildVolumeFolder}`, `/${buildVolumeFolder}`, [
{ ...CloudRunner.defaultGitShaEnvironmentVariable,
name: 'GITHUB_SHA', ...[
value: process.env.GITHUB_SHA || '', {
}, name: 'cacheFolderFull',
{ value: this.cacheFolderFull,
name: 'cacheFolderFull', },
value: this.cacheFolderFull, ],
},
], this.defaultSecrets); ], this.defaultSecrets);
core.info('compression step complete'); core.info('compression step complete');
}); });

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -245,19 +245,6 @@ class CloudRunner {
]; ];
} }
private static readUploadArtifactEnvironmentVariables() {
return [
{
name: 'GITHUB_SHA',
value: process.env.GITHUB_SHA || '',
},
{
name: 'AWS_DEFAULT_REGION',
value: process.env.AWS_DEFAULT_REGION || '',
},
];
}
private static async runMainJob(baseImage: any) { private static async runMainJob(baseImage: any) {
if (!this.buildParams.customBuildSteps) { if (!this.buildParams.customBuildSteps) {
core.info(`Cloud Runner is running in standard build automation mode`); core.info(`Cloud Runner is running in standard build automation mode`);
@ -297,12 +284,7 @@ class CloudRunner {
step['commands'], step['commands'],
`/${buildVolumeFolder}`, `/${buildVolumeFolder}`,
`/${buildVolumeFolder}`, `/${buildVolumeFolder}`,
[ this.defaultGitShaEnvironmentVariable,
{
name: 'GITHUB_SHA',
value: process.env.GITHUB_SHA || '',
},
],
[...this.defaultSecrets, ...stepSecrets], [...this.defaultSecrets, ...stepSecrets],
); );
} }
@ -404,14 +386,13 @@ class CloudRunner {
`/${buildVolumeFolder}`, `/${buildVolumeFolder}`,
`/${buildVolumeFolder}`, `/${buildVolumeFolder}`,
[ [
{ ...CloudRunner.defaultGitShaEnvironmentVariable,
name: 'GITHUB_SHA', ...[
value: process.env.GITHUB_SHA || '', {
}, name: 'cacheFolderFull',
{ value: this.cacheFolderFull,
name: 'cacheFolderFull', },
value: this.cacheFolderFull, ],
},
], ],
this.defaultSecrets, this.defaultSecrets,
); );