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 push to cache

pull/419/head
Frostebite 2022-09-15 17:35:36 +01:00
parent 54fa5f1f94
commit d9daed7713
7 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dist/index.js vendored
View File

@ -823,7 +823,8 @@ class CloudRunner {
CloudRunner.buildParameters = buildParameters; CloudRunner.buildParameters = buildParameters;
CloudRunner.setupBuildPlatform(); CloudRunner.setupBuildPlatform();
CloudRunner.defaultSecrets = task_parameter_serializer_1.TaskParameterSerializer.readDefaultSecrets(); CloudRunner.defaultSecrets = task_parameter_serializer_1.TaskParameterSerializer.readDefaultSecrets();
CloudRunner.cloudRunnerEnvironmentVariables = task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(); CloudRunner.cloudRunnerEnvironmentVariables =
task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(buildParameters);
if (!buildParameters.isCliMode) { if (!buildParameters.isCliMode) {
const buildParameterPropertyNames = Object.getOwnPropertyNames(buildParameters); const buildParameterPropertyNames = Object.getOwnPropertyNames(buildParameters);
for (const element of CloudRunner.cloudRunnerEnvironmentVariables) { for (const element of CloudRunner.cloudRunnerEnvironmentVariables) {
@ -4516,34 +4517,34 @@ const cloud_runner_custom_hooks_1 = __nccwpck_require__(58873);
const cloud_runner_query_override_1 = __importDefault(__nccwpck_require__(31011)); 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));
class TaskParameterSerializer { class TaskParameterSerializer {
static readBuildEnvironmentVariables() { static readBuildEnvironmentVariables(buildParameters) {
return [ return [
{ {
name: 'ContainerMemory', name: 'ContainerMemory',
value: cloud_runner_1.default.buildParameters.cloudRunnerMemory, value: buildParameters.cloudRunnerMemory,
}, },
{ {
name: 'ContainerCpu', name: 'ContainerCpu',
value: cloud_runner_1.default.buildParameters.cloudRunnerCpu, value: buildParameters.cloudRunnerCpu,
}, },
{ {
name: 'BUILD_TARGET', name: 'BUILD_TARGET',
value: cloud_runner_1.default.buildParameters.targetPlatform, value: buildParameters.targetPlatform,
}, },
...TaskParameterSerializer.serializeBuildParamsAndInput, ...TaskParameterSerializer.serializeBuildParamsAndInput(buildParameters),
]; ];
} }
static get serializeBuildParamsAndInput() { static serializeBuildParamsAndInput(buildParameters) {
let array = new Array(); let array = new Array();
array = TaskParameterSerializer.readBuildParameters(array); array = TaskParameterSerializer.readBuildParameters(array, buildParameters);
array = TaskParameterSerializer.readInput(array); array = TaskParameterSerializer.readInput(array);
const configurableHooks = cloud_runner_custom_hooks_1.CloudRunnerCustomHooks.getHooks(cloud_runner_1.default.buildParameters.customJobHooks); const configurableHooks = cloud_runner_custom_hooks_1.CloudRunnerCustomHooks.getHooks(buildParameters.customJobHooks);
const secrets = configurableHooks.map((x) => x.secrets).filter((x) => x !== undefined && x.length > 0); const secrets = configurableHooks.map((x) => x.secrets).filter((x) => x !== undefined && x.length > 0);
if (secrets.length > 0) { if (secrets.length > 0) {
// eslint-disable-next-line unicorn/no-array-reduce // eslint-disable-next-line unicorn/no-array-reduce
array.push(secrets.reduce((x, y) => [...x, ...y])); array.push(secrets.reduce((x, y) => [...x, ...y]));
} }
const blocked = new Set(['0', 'length', 'prototype', '', 'projectPath']); const blocked = new Set(['0', 'length', 'prototype', '', 'projectPath', 'UNITY_VERSION']);
array = array.filter((x) => !blocked.has(x.name)); array = array.filter((x) => !blocked.has(x.name));
array = array.map((x) => { array = array.map((x) => {
x.name = __1.Input.ToEnvVarFormat(x.name); x.name = __1.Input.ToEnvVarFormat(x.name);
@ -4552,15 +4553,15 @@ class TaskParameterSerializer {
}); });
return array; return array;
} }
static readBuildParameters(array) { static readBuildParameters(array, buildParameters) {
const keys = Object.keys(cloud_runner_1.default.buildParameters); const keys = Object.keys(buildParameters);
for (const element of keys) { for (const element of keys) {
array.push({ array.push({
name: element, name: element,
value: cloud_runner_1.default.buildParameters[element], value: buildParameters[element],
}); });
} }
array.push({ name: 'buildParameters', value: JSON.stringify(cloud_runner_1.default.buildParameters) }); array.push({ name: 'buildParameters', value: JSON.stringify(buildParameters) });
return array; return array;
} }
static readInput(array) { static readInput(array) {

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

3
src/model/cli/shared-workspace-locking.ts 100644
View File

@ -0,0 +1,3 @@
export class SharedWorkspaceLocking {}
export default SharedWorkspaceLocking;

3
src/model/cloud-runner/cloud-runner.ts
View File

@ -24,7 +24,8 @@ class CloudRunner {
CloudRunner.buildParameters = buildParameters; CloudRunner.buildParameters = buildParameters;
CloudRunner.setupBuildPlatform(); CloudRunner.setupBuildPlatform();
CloudRunner.defaultSecrets = TaskParameterSerializer.readDefaultSecrets(); CloudRunner.defaultSecrets = TaskParameterSerializer.readDefaultSecrets();
CloudRunner.cloudRunnerEnvironmentVariables = TaskParameterSerializer.readBuildEnvironmentVariables(); CloudRunner.cloudRunnerEnvironmentVariables =
TaskParameterSerializer.readBuildEnvironmentVariables(buildParameters);
if (!buildParameters.isCliMode) { if (!buildParameters.isCliMode) {
const buildParameterPropertyNames = Object.getOwnPropertyNames(buildParameters); const buildParameterPropertyNames = Object.getOwnPropertyNames(buildParameters);
for (const element of CloudRunner.cloudRunnerEnvironmentVariables) { for (const element of CloudRunner.cloudRunnerEnvironmentVariables) {

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

@ -6,37 +6,38 @@ import { CloudRunnerCustomHooks } from './cloud-runner-custom-hooks';
import CloudRunnerSecret from './cloud-runner-secret'; import CloudRunnerSecret from './cloud-runner-secret';
import CloudRunnerQueryOverride from './cloud-runner-query-override'; 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';
export class TaskParameterSerializer { export class TaskParameterSerializer {
public static readBuildEnvironmentVariables(): CloudRunnerEnvironmentVariable[] { public static readBuildEnvironmentVariables(buildParameters: BuildParameters): CloudRunnerEnvironmentVariable[] {
return [ return [
{ {
name: 'ContainerMemory', name: 'ContainerMemory',
value: CloudRunner.buildParameters.cloudRunnerMemory, value: buildParameters.cloudRunnerMemory,
}, },
{ {
name: 'ContainerCpu', name: 'ContainerCpu',
value: CloudRunner.buildParameters.cloudRunnerCpu, value: buildParameters.cloudRunnerCpu,
}, },
{ {
name: 'BUILD_TARGET', name: 'BUILD_TARGET',
value: CloudRunner.buildParameters.targetPlatform, value: buildParameters.targetPlatform,
}, },
...TaskParameterSerializer.serializeBuildParamsAndInput, ...TaskParameterSerializer.serializeBuildParamsAndInput(buildParameters),
]; ];
} }
private static get serializeBuildParamsAndInput() { private static serializeBuildParamsAndInput(buildParameters: BuildParameters) {
let array = new Array(); let array = new Array();
array = TaskParameterSerializer.readBuildParameters(array); array = TaskParameterSerializer.readBuildParameters(array, buildParameters);
array = TaskParameterSerializer.readInput(array); array = TaskParameterSerializer.readInput(array);
const configurableHooks = CloudRunnerCustomHooks.getHooks(CloudRunner.buildParameters.customJobHooks); const configurableHooks = CloudRunnerCustomHooks.getHooks(buildParameters.customJobHooks);
const secrets = configurableHooks.map((x) => x.secrets).filter((x) => x !== undefined && x.length > 0); const secrets = configurableHooks.map((x) => x.secrets).filter((x) => x !== undefined && x.length > 0);
if (secrets.length > 0) { if (secrets.length > 0) {
// eslint-disable-next-line unicorn/no-array-reduce // eslint-disable-next-line unicorn/no-array-reduce
array.push(secrets.reduce((x, y) => [...x, ...y])); array.push(secrets.reduce((x, y) => [...x, ...y]));
} }
const blocked = new Set(['0', 'length', 'prototype', '', 'projectPath']); const blocked = new Set(['0', 'length', 'prototype', '', 'projectPath', 'UNITY_VERSION']);
array = array.filter((x) => !blocked.has(x.name)); array = array.filter((x) => !blocked.has(x.name));
array = array.map((x) => { array = array.map((x) => {
@ -49,15 +50,15 @@ export class TaskParameterSerializer {
return array; return array;
} }
private static readBuildParameters(array: any[]) { private static readBuildParameters(array: any[], buildParameters: BuildParameters) {
const keys = Object.keys(CloudRunner.buildParameters); const keys = Object.keys(buildParameters);
for (const element of keys) { for (const element of keys) {
array.push({ array.push({
name: element, name: element,
value: CloudRunner.buildParameters[element], value: buildParameters[element],
}); });
} }
array.push({ name: 'buildParameters', value: JSON.stringify(CloudRunner.buildParameters) }); array.push({ name: 'buildParameters', value: JSON.stringify(buildParameters) });
return array; return array;
} }

2
src/model/cloud-runner/tests/cloud-runner-local.test.ts
View File

@ -50,7 +50,7 @@ describe('Cloud Runner', () => {
// Assert results // Assert results
expect(file).toContain(JSON.stringify(buildParameter)); expect(file).toContain(JSON.stringify(buildParameter));
expect(file).toContain(`${Input.ToEnvVarFormat(testSecretName)}=${testSecretValue}`); expect(file).toContain(`${Input.ToEnvVarFormat(testSecretName)}=${testSecretValue}`);
const environmentVariables = TaskParameterSerializer.readBuildEnvironmentVariables(); const environmentVariables = TaskParameterSerializer.readBuildEnvironmentVariables(buildParameter);
const newLinePurgedFile = file const newLinePurgedFile = file
.replace(/\s+/g, '') .replace(/\s+/g, '')
.replace(new RegExp(`\\[${CloudRunnerStatics.logPrefix}\\]`, 'g'), ''); .replace(new RegExp(`\\[${CloudRunnerStatics.logPrefix}\\]`, 'g'), '');

3
src/model/cloud-runner/tests/cloud-runner-simple.test.ts
View File

@ -51,7 +51,7 @@ describe('Cloud Runner', () => {
// Assert results // Assert results
expect(file).toContain(JSON.stringify(buildParameter)); expect(file).toContain(JSON.stringify(buildParameter));
expect(file).toContain(`${Input.ToEnvVarFormat(testSecretName)}=${testSecretValue}`); expect(file).toContain(`${Input.ToEnvVarFormat(testSecretName)}=${testSecretValue}`);
const environmentVariables = TaskParameterSerializer.readBuildEnvironmentVariables(); const environmentVariables = TaskParameterSerializer.readBuildEnvironmentVariables(buildParameter);
const newLinePurgedFile = file const newLinePurgedFile = file
.replace(/\s+/g, '') .replace(/\s+/g, '')
.replace(new RegExp(`\\[${CloudRunnerStatics.logPrefix}\\]`, 'g'), ''); .replace(new RegExp(`\\[${CloudRunnerStatics.logPrefix}\\]`, 'g'), '');
@ -66,6 +66,7 @@ describe('Cloud Runner', () => {
for (const element of environmentVariables) { for (const element of environmentVariables) {
if (element.value !== undefined && typeof element.value !== 'function') { if (element.value !== undefined && typeof element.value !== 'function') {
expect(newLinePurgedFile).toContain(`${element.name}`); expect(newLinePurgedFile).toContain(`${element.name}`);
CloudRunnerLogger.log(`Contains ${element.name}`);
expect(newLinePurgedFile).toContain(`${element.name}=${element.value}`); expect(newLinePurgedFile).toContain(`${element.name}=${element.value}`);
} }
} }