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

per provider container defaults

pull/387/head
Frostebite 2022-04-20 22:27:38 +01:00
parent abd49ce7ee
commit 278feb10e1
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/index.js vendored
View File

@ -1073,6 +1073,10 @@ class AWSJobStack {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const taskDefStackName = `${this.baseStackName}-${buildGuid}`; const taskDefStackName = `${this.baseStackName}-${buildGuid}`;
let taskDefCloudFormation = aws_cloud_formation_templates_1.AWSCloudFormationTemplates.readTaskCloudFormationTemplate(); let taskDefCloudFormation = aws_cloud_formation_templates_1.AWSCloudFormationTemplates.readTaskCloudFormationTemplate();
const cpu = cloud_runner_1.default.buildParameters.cloudRunnerCpu || '1024';
const memory = cloud_runner_1.default.buildParameters.cloudRunnerMemory || '2048';
taskDefCloudFormation = taskDefCloudFormation.replace('1024', cpu);
taskDefCloudFormation = taskDefCloudFormation.replace('2048', memory);
for (const secret of secrets) { for (const secret of secrets) {
secret.ParameterKey = `${buildGuid.replace(/[^\dA-Za-z]/g, '')}${secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}`; secret.ParameterKey = `${buildGuid.replace(/[^\dA-Za-z]/g, '')}${secret.ParameterKey.replace(/[^\dA-Za-z]/g, '')}`;
if (typeof secret.ParameterValue == 'number') { if (typeof secret.ParameterValue == 'number') {
@ -1118,14 +1122,6 @@ class AWSJobStack {
ParameterKey: 'EFSMountDirectory', ParameterKey: 'EFSMountDirectory',
ParameterValue: mountdir, ParameterValue: mountdir,
}, },
{
ParameterKey: 'ContainerMemory',
ParameterValue: cloud_runner_1.default.buildParameters.cloudRunnerMemory || '2048',
},
{
ParameterKey: 'ContainerCpu',
ParameterValue: cloud_runner_1.default.buildParameters.cloudRunnerCpu || '1024',
},
...secretsMappedToCloudFormationParameters, ...secretsMappedToCloudFormationParameters,
]; ];
cloud_runner_logger_1.default.log(`Starting AWS job with memory: ${cloud_runner_1.default.buildParameters.cloudRunnerMemory} cpu: ${cloud_runner_1.default.buildParameters.cloudRunnerCpu}`); cloud_runner_logger_1.default.log(`Starting AWS job with memory: ${cloud_runner_1.default.buildParameters.cloudRunnerMemory} cpu: ${cloud_runner_1.default.buildParameters.cloudRunnerCpu}`);

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -24,6 +24,10 @@ export class AWSJobStack {
): Promise<CloudRunnerAWSTaskDef> { ): Promise<CloudRunnerAWSTaskDef> {
const taskDefStackName = `${this.baseStackName}-${buildGuid}`; const taskDefStackName = `${this.baseStackName}-${buildGuid}`;
let taskDefCloudFormation = AWSCloudFormationTemplates.readTaskCloudFormationTemplate(); let taskDefCloudFormation = AWSCloudFormationTemplates.readTaskCloudFormationTemplate();
const cpu = CloudRunner.buildParameters.cloudRunnerCpu || '1024';
const memory = CloudRunner.buildParameters.cloudRunnerMemory || '2048';
taskDefCloudFormation = taskDefCloudFormation.replace('1024', cpu);
taskDefCloudFormation = taskDefCloudFormation.replace('2048', memory);
for (const secret of secrets) { for (const secret of secrets) {
secret.ParameterKey = `${buildGuid.replace(/[^\dA-Za-z]/g, '')}${secret.ParameterKey.replace( secret.ParameterKey = `${buildGuid.replace(/[^\dA-Za-z]/g, '')}${secret.ParameterKey.replace(
/[^\dA-Za-z]/g, /[^\dA-Za-z]/g,
@ -84,14 +88,6 @@ export class AWSJobStack {
ParameterKey: 'EFSMountDirectory', ParameterKey: 'EFSMountDirectory',
ParameterValue: mountdir, ParameterValue: mountdir,
}, },
{
ParameterKey: 'ContainerMemory',
ParameterValue: CloudRunner.buildParameters.cloudRunnerMemory || '2048',
},
{
ParameterKey: 'ContainerCpu',
ParameterValue: CloudRunner.buildParameters.cloudRunnerCpu || '1024',
},
...secretsMappedToCloudFormationParameters, ...secretsMappedToCloudFormationParameters,
]; ];
CloudRunnerLogger.log( CloudRunnerLogger.log(