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 serialize custom job parameter

pull/461/head
Frostebite 2022-09-26 17:29:41 +01:00
parent 9f6a951adb
commit ce3be8fea0
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dist/index.js vendored
View File

@ -4726,7 +4726,6 @@ const cloud_runner_query_override_1 = __importDefault(__nccwpck_require__(31011)
const cloud_runner_options_reader_1 = __importDefault(__nccwpck_require__(3343)); const cloud_runner_options_reader_1 = __importDefault(__nccwpck_require__(3343));
const build_parameters_1 = __importDefault(__nccwpck_require__(80787)); const build_parameters_1 = __importDefault(__nccwpck_require__(80787));
const cloud_runner_options_1 = __importDefault(__nccwpck_require__(96552)); const cloud_runner_options_1 = __importDefault(__nccwpck_require__(96552));
const base_64_1 = __importDefault(__nccwpck_require__(85848));
// import CloudRunner from '../cloud-runner'; // import CloudRunner from '../cloud-runner';
// import ImageEnvironmentFactory from '../../image-environment-factory'; // import ImageEnvironmentFactory from '../../image-environment-factory';
const core = __importStar(__nccwpck_require__(42186)); const core = __importStar(__nccwpck_require__(42186));
@ -4752,13 +4751,15 @@ class TaskParameterSerializer {
.filter((x) => !TaskParameterSerializer.blocked.has(x.name) && .filter((x) => !TaskParameterSerializer.blocked.has(x.name) &&
x.value !== '' && x.value !== '' &&
x.value !== undefined && x.value !== undefined &&
x.name !== `CUSTOM_JOB` &&
x.name !== `GAMECI-CUSTOM_JOB` &&
x.value !== `undefined`) x.value !== `undefined`)
.map((x) => { .map((x) => {
x.name = TaskParameterSerializer.ToEnvVarFormat(x.name); x.name = TaskParameterSerializer.ToEnvVarFormat(x.name);
x.value = `${x.value}`; x.value = `${x.value}`;
if (x.name === `CUSTOM_JOB` || x.name === `GAMECI-CUSTOM_JOB`) { // if (x.name === `CUSTOM_JOB` || x.name === `GAMECI-CUSTOM_JOB`) {
x.value = base_64_1.default.encode(x.value); // x.value = base64.encode(x.value);
} // }
if (buildParameters.cloudRunnerIntegrationTests) { if (buildParameters.cloudRunnerIntegrationTests) {
if (Number(x.name) === Number.NaN) { if (Number(x.name) === Number.NaN) {
core.info(`[ERROR] found a number in task param serializer ${JSON.stringify(x)}`); core.info(`[ERROR] found a number in task param serializer ${JSON.stringify(x)}`);
@ -4769,7 +4770,8 @@ class TaskParameterSerializer {
} }
return x; return x;
}), (item) => item.name); }), (item) => item.name);
core.info(`Serialized Env Vars ${JSON.stringify(result, undefined, 4)}`); core.info(`Serialized Env Vars`);
core.info(JSON.stringify(result, undefined, 4));
return result; return result;
} }
static uniqBy(a, key) { static uniqBy(a, key) {
@ -4787,9 +4789,9 @@ class TaskParameterSerializer {
.map((x) => TaskParameterSerializer.UndoEnvVarFormat(x))), .map((x) => TaskParameterSerializer.UndoEnvVarFormat(x))),
]; ];
for (const element of keys) { for (const element of keys) {
buildParameters[element] = process.env[`GAMECI-${TaskParameterSerializer.ToEnvVarFormat(element)}`]; if (element !== `customJob`) {
if (element === `customJob`) { buildParameters[element] = process.env[`GAMECI-${TaskParameterSerializer.ToEnvVarFormat(element)}`];
buildParameters[element] = base_64_1.default.decode(buildParameters[element]); // buildParameters[element] = base64.decode(buildParameters[element]);
} }
} }
return buildParameters; return buildParameters;

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -6,7 +6,6 @@ import CloudRunnerQueryOverride from './cloud-runner-query-override';
import CloudRunnerOptionsReader from './cloud-runner-options-reader'; import CloudRunnerOptionsReader from './cloud-runner-options-reader';
import BuildParameters from '../../build-parameters'; import BuildParameters from '../../build-parameters';
import CloudRunnerOptions from '../cloud-runner-options'; import CloudRunnerOptions from '../cloud-runner-options';
import base64 from 'base-64';
// import CloudRunner from '../cloud-runner'; // import CloudRunner from '../cloud-runner';
// import ImageEnvironmentFactory from '../../image-environment-factory'; // import ImageEnvironmentFactory from '../../image-environment-factory';
@ -40,14 +39,18 @@ export class TaskParameterSerializer {
!TaskParameterSerializer.blocked.has(x.name) && !TaskParameterSerializer.blocked.has(x.name) &&
x.value !== '' && x.value !== '' &&
x.value !== undefined && x.value !== undefined &&
x.name !== `CUSTOM_JOB` &&
x.name !== `GAMECI-CUSTOM_JOB` &&
x.value !== `undefined`, x.value !== `undefined`,
) )
.map((x) => { .map((x) => {
x.name = TaskParameterSerializer.ToEnvVarFormat(x.name); x.name = TaskParameterSerializer.ToEnvVarFormat(x.name);
x.value = `${x.value}`; x.value = `${x.value}`;
if (x.name === `CUSTOM_JOB` || x.name === `GAMECI-CUSTOM_JOB`) {
x.value = base64.encode(x.value); // if (x.name === `CUSTOM_JOB` || x.name === `GAMECI-CUSTOM_JOB`) {
} // x.value = base64.encode(x.value);
// }
if (buildParameters.cloudRunnerIntegrationTests) { if (buildParameters.cloudRunnerIntegrationTests) {
if (Number(x.name) === Number.NaN) { if (Number(x.name) === Number.NaN) {
core.info(`[ERROR] found a number in task param serializer ${JSON.stringify(x)}`); core.info(`[ERROR] found a number in task param serializer ${JSON.stringify(x)}`);
@ -60,7 +63,8 @@ export class TaskParameterSerializer {
}), }),
(item) => item.name, (item) => item.name,
); );
core.info(`Serialized Env Vars ${JSON.stringify(result, undefined, 4)}`); core.info(`Serialized Env Vars`);
core.info(JSON.stringify(result, undefined, 4));
return result; return result;
} }
@ -85,9 +89,10 @@ export class TaskParameterSerializer {
), ),
]; ];
for (const element of keys) { for (const element of keys) {
buildParameters[element] = process.env[`GAMECI-${TaskParameterSerializer.ToEnvVarFormat(element)}`]; if (element !== `customJob`) {
if (element === `customJob`) { buildParameters[element] = process.env[`GAMECI-${TaskParameterSerializer.ToEnvVarFormat(element)}`];
buildParameters[element] = base64.decode(buildParameters[element]);
// buildParameters[element] = base64.decode(buildParameters[element]);
} }
} }