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

fix

pull/310/head
Frostebite 2021-12-30 17:49:16 +00:00
parent 0bd608a349
commit fe1a57dc63
5 changed files with 27 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dist/index.js vendored
View File

@ -2512,6 +2512,7 @@ const image_environment_factory_1 = __importDefault(__webpack_require__(25145));
const cloud_runner_state_1 = __webpack_require__(70912);
class TaskParameterSerializer {
static readBuildEnvironmentVariables() {
TaskParameterSerializer.setupDefaultSecrets();
return [
{
name: 'ContainerMemory',
@ -2536,7 +2537,7 @@ class TaskParameterSerializer {
let array = new Array();
array = TaskParameterSerializer.readBuildParameters(array);
array = TaskParameterSerializer.readInput(array);
array = array.filter((x) => x.value !== undefined && x.name !== '0');
array = array.filter((x) => x.value !== undefined && x.name !== '0' && x.value !== '');
return array;
}
static readBuildParameters(array) {
@ -2549,7 +2550,7 @@ class TaskParameterSerializer {
//},
{
name: __1.Input.ToEnvVarFormat(element),
value: cloud_runner_state_1.CloudRunnerState.buildParams[element].toString(),
value: cloud_runner_state_1.CloudRunnerState.buildParams[element],
});
}
array.push({ name: 'buildParameters', value: JSON.stringify(cloud_runner_state_1.CloudRunnerState.buildParams) }, {
@ -2576,14 +2577,14 @@ class TaskParameterSerializer {
return array;
}
static setupDefaultSecrets() {
cloud_runner_state_1.CloudRunnerState.defaultSecrets = [];
cloud_runner_state_1.CloudRunnerState.defaultSecrets.push(...image_environment_factory_1.default.getEnvironmentVariables(cloud_runner_state_1.CloudRunnerState.buildParams).map((x) => {
return {
ParameterKey: x.name,
EnvironmentVariable: x.name,
ParameterValue: x.value,
};
}));
if (cloud_runner_state_1.CloudRunnerState.defaultSecrets === undefined)
cloud_runner_state_1.CloudRunnerState.defaultSecrets = image_environment_factory_1.default.getEnvironmentVariables(cloud_runner_state_1.CloudRunnerState.buildParams).map((x) => {
return {
ParameterKey: x.name,
EnvironmentVariable: x.name,
ParameterValue: x.value,
};
});
}
}
exports.TaskParameterSerializer = TaskParameterSerializer;
@ -2610,7 +2611,6 @@ class CloudRunnerState {
if (CloudRunnerState.buildGuid === undefined) {
CloudRunnerState.buildGuid = cloud_runner_namespace_1.default.generateBuildName(CloudRunnerState.runNumber, buildParameters.platform);
}
task_parameter_serializer_1.TaskParameterSerializer.setupDefaultSecrets();
}
static get branchName() {
return CloudRunnerState.buildParams.branch;

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

11
src/model/cloud-runner/cloud-runner.test.ts
View File

@ -4,6 +4,7 @@ import Input from '../input';
import fs from 'fs';
import { CloudRunnerState } from './state/cloud-runner-state';
import { CloudRunnerStatics } from './cloud-runner-statics';
import { TaskParameterSerializer } from './services/task-parameter-serializer';
describe('Cloud Runner', () => {
it('responds', () => {});
@ -35,14 +36,14 @@ describe('Cloud Runner', () => {
const file = fs.readFileSync(testOutput, 'utf-8').toString();
expect(file).toContain(JSON.stringify(buildParameter));
expect(file).toContain(`${Input.ToEnvVarFormat(testSecretName)}=${testSecretValue}`);
const inputKeys = Object.getOwnPropertyNames(Input);
const environmentVariables = TaskParameterSerializer.readBuildEnvironmentVariables();
const newLinePurgedFile = file
.replace(/\s+/g, '')
.replace(new RegExp(`\\[${CloudRunnerStatics.logPrefix}\\]`, 'g'), '');
for (const element of inputKeys) {
if (Input[element] !== undefined && typeof Input[element] !== 'function') {
const newLinePurgedValue = Input[element].toString().replace(/\s+/g, '');
expect(newLinePurgedFile).toContain(`${Input.ToEnvVarFormat(element)}=${newLinePurgedValue}`);
for (const element of environmentVariables) {
if (element.value !== undefined && typeof element.value !== 'function') {
const newLinePurgedValue = element.value.toString().replace(/\s+/g, '');
expect(newLinePurgedFile).toContain(`${Input.ToEnvVarFormat(element.name)}=${newLinePurgedValue}`);
}
}
}

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

@ -5,6 +5,7 @@ import { CloudRunnerState } from '../state/cloud-runner-state';
export class TaskParameterSerializer {
public static readBuildEnvironmentVariables(): CloudRunnerEnvironmentVariable[] {
TaskParameterSerializer.setupDefaultSecrets();
return [
{
name: 'ContainerMemory',
@ -29,7 +30,7 @@ export class TaskParameterSerializer {
let array = new Array();
array = TaskParameterSerializer.readBuildParameters(array);
array = TaskParameterSerializer.readInput(array);
array = array.filter((x) => x.value !== undefined && x.name !== '0');
array = array.filter((x) => x.value !== undefined && x.name !== '0' && x.value !== '');
return array;
}
@ -43,7 +44,7 @@ export class TaskParameterSerializer {
//},
{
name: Input.ToEnvVarFormat(element),
value: CloudRunnerState.buildParams[element].toString(),
value: CloudRunnerState.buildParams[element],
},
);
}
@ -76,57 +77,16 @@ export class TaskParameterSerializer {
return array;
}
public static setupDefaultSecrets() {
CloudRunnerState.defaultSecrets = [
{
ParameterKey: 'GithubToken',
EnvironmentVariable: 'GITHUB_TOKEN',
ParameterValue: CloudRunnerState.buildParams.githubToken,
},
{
ParameterKey: 'branch',
EnvironmentVariable: 'branch',
ParameterValue: CloudRunnerState.branchName,
},
{
ParameterKey: 'buildPathFull',
EnvironmentVariable: 'buildPathFull',
ParameterValue: CloudRunnerState.buildPathFull,
},
{
ParameterKey: 'projectPathFull',
EnvironmentVariable: 'projectPathFull',
ParameterValue: CloudRunnerState.projectPathFull,
},
{
ParameterKey: 'libraryFolderFull',
EnvironmentVariable: 'libraryFolderFull',
ParameterValue: CloudRunnerState.libraryFolderFull,
},
{
ParameterKey: 'builderPathFull',
EnvironmentVariable: 'builderPathFull',
ParameterValue: CloudRunnerState.builderPathFull,
},
{
ParameterKey: 'repoPathFull',
EnvironmentVariable: 'repoPathFull',
ParameterValue: CloudRunnerState.repoPathFull,
},
{
ParameterKey: 'steamPathFull',
EnvironmentVariable: 'steamPathFull',
ParameterValue: CloudRunnerState.steamPathFull,
},
];
CloudRunnerState.defaultSecrets.push(
...ImageEnvironmentFactory.getEnvironmentVariables(CloudRunnerState.buildParams).map((x) => {
private static setupDefaultSecrets() {
if (CloudRunnerState.defaultSecrets === undefined)
CloudRunnerState.defaultSecrets = ImageEnvironmentFactory.getEnvironmentVariables(
CloudRunnerState.buildParams,
).map((x) => {
return {
ParameterKey: x.name,
EnvironmentVariable: x.name,
ParameterValue: x.value,
};
}),
);
});
}
}

1
src/model/cloud-runner/state/cloud-runner-state.ts
View File

@ -21,7 +21,6 @@ export class CloudRunnerState {
buildParameters.platform,
);
}
TaskParameterSerializer.setupDefaultSecrets();
}
public static get branchName(): string {