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

Kubernetes use env var based secrets

pull/310/head
Frostebite 2021-12-29 23:49:47 +00:00
parent 4c923c5609
commit 3b278c3301
6 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dist/index.js vendored
View File

@ -1074,10 +1074,6 @@ class AWSJobStack {
ParameterKey: 'EFSMountDirectory', ParameterKey: 'EFSMountDirectory',
ParameterValue: mountdir, ParameterValue: mountdir,
}, },
{
ParameterKey: 'BUILDID',
ParameterValue: buildGuid,
},
...secretsMappedToCloudFormationParameters, ...secretsMappedToCloudFormationParameters,
]; ];
let previousStackExists = true; let previousStackExists = true;
@ -1120,10 +1116,6 @@ class AWSJobStack {
ParameterKey: 'TTL', ParameterKey: 'TTL',
ParameterValue: '100', ParameterValue: '100',
}, },
{
ParameterKey: 'BUILDID',
ParameterValue: buildGuid,
},
{ {
ParameterKey: 'EnvironmentName', ParameterKey: 'EnvironmentName',
ParameterValue: this.baseStackName, ParameterValue: this.baseStackName,
@ -1220,7 +1212,7 @@ class AWSTaskRunner {
containerOverrides: [ containerOverrides: [
{ {
name: taskDef.taskDefStackName, name: taskDef.taskDefStackName,
environment: [...environment, { name: 'BUILDID', value: buildGuid }], environment,
command: ['-c', cloud_runner_build_command_process_1.CloudRunnerBuildCommandProcessor.ProcessCommands(commands, cloud_runner_state_1.CloudRunnerState.buildParams)], command: ['-c', cloud_runner_build_command_process_1.CloudRunnerBuildCommandProcessor.ProcessCommands(commands, cloud_runner_state_1.CloudRunnerState.buildParams)],
}, },
], ],
@ -2594,7 +2586,10 @@ class TaskParameterSerializer {
value: `${cloud_runner_state_1.CloudRunnerState.buildParams[element]}`, value: `${cloud_runner_state_1.CloudRunnerState.buildParams[element]}`,
}); });
} }
array.push({ name: 'buildParameters', value: JSON.stringify(cloud_runner_state_1.CloudRunnerState.buildParams) }); array.push({ name: 'buildParameters', value: JSON.stringify(cloud_runner_state_1.CloudRunnerState.buildParams) }, {
name: Object.keys(cloud_runner_state_1.CloudRunnerState.buildGuid)[0],
value: cloud_runner_state_1.CloudRunnerState.buildGuid,
});
return array; return array;
} }
static readInput(array) { static readInput(array) {
@ -2819,13 +2814,13 @@ class BuildStep {
apt-get update apt-get update
apt-get install -y -q zip apt-get install -y -q zip
cd "${cloud_runner_state_1.CloudRunnerState.libraryFolderFull}/.." cd "${cloud_runner_state_1.CloudRunnerState.libraryFolderFull}/.."
zip -r "lib-$BUILDID.zip" "./Library" zip -r "lib-$buildGuid.zip" "./Library"
mv "lib-$BUILDID.zip" "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/lib" mv "lib-$buildGuid.zip" "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/lib"
ls -lh "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/lib" ls -lh "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/lib"
cd "${cloud_runner_state_1.CloudRunnerState.repoPathFull}" cd "${cloud_runner_state_1.CloudRunnerState.repoPathFull}"
ls -lh "${cloud_runner_state_1.CloudRunnerState.repoPathFull}" ls -lh "${cloud_runner_state_1.CloudRunnerState.repoPathFull}"
zip -r "build-$BUILDID.zip" "./${cloud_runner_state_1.CloudRunnerState.buildParams.buildPath}" zip -r "build-$buildGuid.zip" "./${cloud_runner_state_1.CloudRunnerState.buildParams.buildPath}"
mv "build-$BUILDID.zip" "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/build-$BUILDID.zip" mv "build-$buildGuid.zip" "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/build-$buildGuid.zip"
ls ${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/lib ls ${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/lib
echo " " echo " "
ls ls

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
src/model/cloud-runner/aws/aws-job-stack.ts
View File

@ -86,10 +86,6 @@ export class AWSJobStack {
ParameterKey: 'EFSMountDirectory', ParameterKey: 'EFSMountDirectory',
ParameterValue: mountdir, ParameterValue: mountdir,
}, },
{
ParameterKey: 'BUILDID',
ParameterValue: buildGuid,
},
...secretsMappedToCloudFormationParameters, ...secretsMappedToCloudFormationParameters,
]; ];
@ -134,10 +130,6 @@ export class AWSJobStack {
ParameterKey: 'TTL', ParameterKey: 'TTL',
ParameterValue: '100', ParameterValue: '100',
}, },
{
ParameterKey: 'BUILDID',
ParameterValue: buildGuid,
},
{ {
ParameterKey: 'EnvironmentName', ParameterKey: 'EnvironmentName',
ParameterValue: this.baseStackName, ParameterValue: this.baseStackName,

2
src/model/cloud-runner/aws/aws-task-runner.ts
View File

@ -39,7 +39,7 @@ class AWSTaskRunner {
containerOverrides: [ containerOverrides: [
{ {
name: taskDef.taskDefStackName, name: taskDef.taskDefStackName,
environment: [...environment, { name: 'BUILDID', value: buildGuid }], environment,
command: ['-c', CloudRunnerBuildCommandProcessor.ProcessCommands(commands, CloudRunnerState.buildParams)], command: ['-c', CloudRunnerBuildCommandProcessor.ProcessCommands(commands, CloudRunnerState.buildParams)],
}, },
], ],

8
src/model/cloud-runner/services/task-parameter-serializer.ts
View File

@ -77,7 +77,13 @@ export class TaskParameterSerializer {
value: `${CloudRunnerState.buildParams[element]}`, value: `${CloudRunnerState.buildParams[element]}`,
}); });
} }
array.push({ name: 'buildParameters', value: JSON.stringify(CloudRunnerState.buildParams) }); array.push(
{ name: 'buildParameters', value: JSON.stringify(CloudRunnerState.buildParams) },
{
name: Object.keys(CloudRunnerState.buildGuid)[0],
value: CloudRunnerState.buildGuid,
},
);
return array; return array;
} }

8
src/model/cloud-runner/steps/build-step.ts
View File

@ -34,13 +34,13 @@ export class BuildStep implements StepInterface {
apt-get update apt-get update
apt-get install -y -q zip apt-get install -y -q zip
cd "${CloudRunnerState.libraryFolderFull}/.." cd "${CloudRunnerState.libraryFolderFull}/.."
zip -r "lib-$BUILDID.zip" "./Library" zip -r "lib-$buildGuid.zip" "./Library"
mv "lib-$BUILDID.zip" "${CloudRunnerState.cacheFolderFull}/lib" mv "lib-$buildGuid.zip" "${CloudRunnerState.cacheFolderFull}/lib"
ls -lh "${CloudRunnerState.cacheFolderFull}/lib" ls -lh "${CloudRunnerState.cacheFolderFull}/lib"
cd "${CloudRunnerState.repoPathFull}" cd "${CloudRunnerState.repoPathFull}"
ls -lh "${CloudRunnerState.repoPathFull}" ls -lh "${CloudRunnerState.repoPathFull}"
zip -r "build-$BUILDID.zip" "./${CloudRunnerState.buildParams.buildPath}" zip -r "build-$buildGuid.zip" "./${CloudRunnerState.buildParams.buildPath}"
mv "build-$BUILDID.zip" "${CloudRunnerState.cacheFolderFull}/build-$BUILDID.zip" mv "build-$buildGuid.zip" "${CloudRunnerState.cacheFolderFull}/build-$buildGuid.zip"
ls ${CloudRunnerState.cacheFolderFull}/lib ls ${CloudRunnerState.cacheFolderFull}/lib
echo " " echo " "
ls ls