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

Custom step file support

pull/437/head
Frostebite 2022-10-08 03:42:20 +01:00
parent 44fd7fb781
commit 80d9f51457
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/index.js vendored
View File

@ -4470,13 +4470,14 @@ class CloudRunnerCustomSteps {
} }
const isArray = steps[0] === `-`; const isArray = steps[0] === `-`;
const object = isArray ? yaml_1.default.parse(steps) : [yaml_1.default.parse(steps)]; const object = isArray ? yaml_1.default.parse(steps) : [yaml_1.default.parse(steps)];
if (isArray) {
for (const step of object) { for (const step of object) {
CloudRunnerCustomSteps.ConvertYamlSecrets(step); CloudRunnerCustomSteps.ConvertYamlSecrets(step);
if (step.secrets === undefined) {
step.secrets = [];
} }
if (step.image === undefined) {
step.image = `ubuntu`;
} }
else {
CloudRunnerCustomSteps.ConvertYamlSecrets(object);
} }
if (object === undefined) { if (object === undefined) {
throw new Error(`Failed to parse ${steps}`); throw new Error(`Failed to parse ${steps}`);
@ -5380,9 +5381,6 @@ class CustomWorkflow {
if ((_a = __1.CloudRunner.buildParameters) === null || _a === void 0 ? void 0 : _a.cloudRunnerIntegrationTests) { if ((_a = __1.CloudRunner.buildParameters) === null || _a === void 0 ? void 0 : _a.cloudRunnerIntegrationTests) {
cloud_runner_logger_1.default.log(`Custom Job Description \n ${JSON.stringify(step, undefined, 4)}`); cloud_runner_logger_1.default.log(`Custom Job Description \n ${JSON.stringify(step, undefined, 4)}`);
} }
if (step.secrets === undefined) {
step.secrets = [];
}
output += yield __1.CloudRunner.Provider.runTask(__1.CloudRunner.buildParameters.buildGuid, step['image'], step['commands'], `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}`, `/${cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute}/`, environmentVariables, [...secrets, ...step.secrets]); output += yield __1.CloudRunner.Provider.runTask(__1.CloudRunner.buildParameters.buildGuid, step['image'], step['commands'], `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}`, `/${cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute}/`, environmentVariables, [...secrets, ...step.secrets]);
} }
return output; return output;

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
src/model/cloud-runner/services/cloud-runner-custom-steps.ts
View File

@ -55,12 +55,14 @@ export class CloudRunnerCustomSteps {
} }
const isArray = steps[0] === `-`; const isArray = steps[0] === `-`;
const object: CustomStep[] = isArray ? YAML.parse(steps) : [YAML.parse(steps)]; const object: CustomStep[] = isArray ? YAML.parse(steps) : [YAML.parse(steps)];
if (isArray) {
for (const step of object) { for (const step of object) {
CloudRunnerCustomSteps.ConvertYamlSecrets(step); CloudRunnerCustomSteps.ConvertYamlSecrets(step);
if (step.secrets === undefined) {
step.secrets = [];
}
if (step.image === undefined) {
step.image = `ubuntu`;
} }
} else {
CloudRunnerCustomSteps.ConvertYamlSecrets(object);
} }
if (object === undefined) { if (object === undefined) {
throw new Error(`Failed to parse ${steps}`); throw new Error(`Failed to parse ${steps}`);

3
src/model/cloud-runner/workflows/custom-workflow.ts
View File

@ -30,9 +30,6 @@ export class CustomWorkflow {
if (CloudRunner.buildParameters?.cloudRunnerIntegrationTests) { if (CloudRunner.buildParameters?.cloudRunnerIntegrationTests) {
CloudRunnerLogger.log(`Custom Job Description \n ${JSON.stringify(step, undefined, 4)}`); CloudRunnerLogger.log(`Custom Job Description \n ${JSON.stringify(step, undefined, 4)}`);
} }
if (step.secrets === undefined) {
step.secrets = [];
}
output += await CloudRunner.Provider.runTask( output += await CloudRunner.Provider.runTask(
CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters.buildGuid,