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

better named tests and log local-docker params

pull/461/head
Frostebite 2022-09-21 04:27:19 +01:00
parent 9234f81cfd
commit 250d9de02f
6 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/index.js vendored
View File

@ -4717,9 +4717,14 @@ class TaskParameterSerializer {
.map((x) => { .map((x) => {
x.name = __1.Input.ToEnvVarFormat(x.name); x.name = __1.Input.ToEnvVarFormat(x.name);
x.value = `${x.value}`; x.value = `${x.value}`;
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)}`);
} }
else {
core.info(`${JSON.stringify(x)}`);
}
}
return x; return x;
}); });
} }
@ -4878,7 +4883,7 @@ class BuildAutomationWorkflow {
core.startGroup('pre build steps'); core.startGroup('pre build steps');
let output = ''; let output = '';
if (cloud_runner_1.default.buildParameters.preBuildSteps !== '') { if (cloud_runner_1.default.buildParameters.preBuildSteps !== '') {
output += yield custom_workflow_1.CustomWorkflow.runCustomJob(cloud_runner_1.default.buildParameters.preBuildSteps); output += yield custom_workflow_1.CustomWorkflow.runCustomJob(cloud_runner_1.default.buildParameters.preBuildSteps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
} }
if (!cloud_runner_1.default.buildParameters.isCliMode) if (!cloud_runner_1.default.buildParameters.isCliMode)
core.endGroup(); core.endGroup();
@ -4897,7 +4902,7 @@ class BuildAutomationWorkflow {
if (!cloud_runner_1.default.buildParameters.isCliMode) if (!cloud_runner_1.default.buildParameters.isCliMode)
core.startGroup('post build steps'); core.startGroup('post build steps');
if (cloud_runner_1.default.buildParameters.postBuildSteps !== '') { if (cloud_runner_1.default.buildParameters.postBuildSteps !== '') {
output += yield custom_workflow_1.CustomWorkflow.runCustomJob(cloud_runner_1.default.buildParameters.postBuildSteps); output += yield custom_workflow_1.CustomWorkflow.runCustomJob(cloud_runner_1.default.buildParameters.postBuildSteps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
} }
if (!cloud_runner_1.default.buildParameters.isCliMode) if (!cloud_runner_1.default.buildParameters.isCliMode)
core.endGroup(); core.endGroup();
@ -4990,7 +4995,7 @@ const cloud_runner_folders_1 = __nccwpck_require__(13527);
const yaml_1 = __importDefault(__nccwpck_require__(44603)); const yaml_1 = __importDefault(__nccwpck_require__(44603));
const __1 = __nccwpck_require__(41359); const __1 = __nccwpck_require__(41359);
class CustomWorkflow { class CustomWorkflow {
static runCustomJob(buildSteps) { static runCustomJob(buildSteps, environmentVariables, secrets) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
try { try {
cloud_runner_logger_1.default.log(`Cloud Runner is running in custom job mode`); cloud_runner_logger_1.default.log(`Cloud Runner is running in custom job mode`);
@ -5014,7 +5019,7 @@ class CustomWorkflow {
}; };
return secret; return secret;
}); });
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}/`, __1.CloudRunner.cloudRunnerEnvironmentVariables, [...__1.CloudRunner.defaultSecrets, ...stepSecrets]); 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, ...stepSecrets]);
} }
return output; return output;
} }
@ -5067,7 +5072,7 @@ class WorkflowCompositionRoot {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
try { try {
if (cloud_runner_1.default.buildParameters.customJob !== '') { if (cloud_runner_1.default.buildParameters.customJob !== '') {
return yield custom_workflow_1.CustomWorkflow.runCustomJob(cloud_runner_1.default.buildParameters.customJob); return yield custom_workflow_1.CustomWorkflow.runCustomJob(cloud_runner_1.default.buildParameters.customJob, cloud_runner_1.default.cloudRunnerEnvironmentVariables, cloud_runner_1.default.defaultSecrets);
} }
return yield new build_automation_workflow_1.BuildAutomationWorkflow().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, cloud_runner_1.default.cloudRunnerEnvironmentVariables, cloud_runner_1.default.defaultSecrets)); return yield new build_automation_workflow_1.BuildAutomationWorkflow().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, cloud_runner_1.default.cloudRunnerEnvironmentVariables, cloud_runner_1.default.defaultSecrets));
} }

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -35,9 +35,12 @@ export class TaskParameterSerializer {
.map((x) => { .map((x) => {
x.name = Input.ToEnvVarFormat(x.name); x.name = Input.ToEnvVarFormat(x.name);
x.value = `${x.value}`; x.value = `${x.value}`;
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)}`);
} else {
core.info(`${JSON.stringify(x)}`);
}
} }
return x; return x;

12
src/model/cloud-runner/workflows/build-automation-workflow.ts
View File

@ -27,7 +27,11 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
if (!CloudRunner.buildParameters.isCliMode) core.startGroup('pre build steps'); if (!CloudRunner.buildParameters.isCliMode) core.startGroup('pre build steps');
let output = ''; let output = '';
if (CloudRunner.buildParameters.preBuildSteps !== '') { if (CloudRunner.buildParameters.preBuildSteps !== '') {
output += await CustomWorkflow.runCustomJob(CloudRunner.buildParameters.preBuildSteps); output += await CustomWorkflow.runCustomJob(
CloudRunner.buildParameters.preBuildSteps,
cloudRunnerStepState.environment,
cloudRunnerStepState.secrets,
);
} }
if (!CloudRunner.buildParameters.isCliMode) core.endGroup(); if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
CloudRunnerLogger.logWithTime('Configurable pre build step(s) time'); CloudRunnerLogger.logWithTime('Configurable pre build step(s) time');
@ -54,7 +58,11 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
if (!CloudRunner.buildParameters.isCliMode) core.startGroup('post build steps'); if (!CloudRunner.buildParameters.isCliMode) core.startGroup('post build steps');
if (CloudRunner.buildParameters.postBuildSteps !== '') { if (CloudRunner.buildParameters.postBuildSteps !== '') {
output += await CustomWorkflow.runCustomJob(CloudRunner.buildParameters.postBuildSteps); output += await CustomWorkflow.runCustomJob(
CloudRunner.buildParameters.postBuildSteps,
cloudRunnerStepState.environment,
cloudRunnerStepState.secrets,
);
} }
if (!CloudRunner.buildParameters.isCliMode) core.endGroup(); if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
CloudRunnerLogger.logWithTime('Configurable post build step(s) time'); CloudRunnerLogger.logWithTime('Configurable post build step(s) time');

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

@ -3,9 +3,14 @@ import CloudRunnerSecret from '../services/cloud-runner-secret';
import { CloudRunnerFolders } from '../services/cloud-runner-folders'; import { CloudRunnerFolders } from '../services/cloud-runner-folders';
import YAML from 'yaml'; import YAML from 'yaml';
import { CloudRunner, Input } from '../..'; import { CloudRunner, Input } from '../..';
import CloudRunnerEnvironmentVariable from '../services/cloud-runner-environment-variable';
export class CustomWorkflow { export class CustomWorkflow {
public static async runCustomJob(buildSteps) { public static async runCustomJob(
buildSteps,
environmentVariables: CloudRunnerEnvironmentVariable[],
secrets: CloudRunnerSecret[],
) {
try { try {
CloudRunnerLogger.log(`Cloud Runner is running in custom job mode`); CloudRunnerLogger.log(`Cloud Runner is running in custom job mode`);
if (CloudRunner.buildParameters.cloudRunnerIntegrationTests) { if (CloudRunner.buildParameters.cloudRunnerIntegrationTests) {
@ -34,8 +39,8 @@ export class CustomWorkflow {
step['commands'], step['commands'],
`/${CloudRunnerFolders.buildVolumeFolder}`, `/${CloudRunnerFolders.buildVolumeFolder}`,
`/${CloudRunnerFolders.projectPathAbsolute}/`, `/${CloudRunnerFolders.projectPathAbsolute}/`,
CloudRunner.cloudRunnerEnvironmentVariables, environmentVariables,
[...CloudRunner.defaultSecrets, ...stepSecrets], [...secrets, ...stepSecrets],
); );
} }

6
src/model/cloud-runner/workflows/workflow-composition-root.ts
View File

@ -16,7 +16,11 @@ export class WorkflowCompositionRoot implements WorkflowInterface {
private static async runJob(baseImage: any) { private static async runJob(baseImage: any) {
try { try {
if (CloudRunner.buildParameters.customJob !== '') { if (CloudRunner.buildParameters.customJob !== '') {
return await CustomWorkflow.runCustomJob(CloudRunner.buildParameters.customJob); return await CustomWorkflow.runCustomJob(
CloudRunner.buildParameters.customJob,
CloudRunner.cloudRunnerEnvironmentVariables,
CloudRunner.defaultSecrets,
);
} }
return await new BuildAutomationWorkflow().run( return await new BuildAutomationWorkflow().run(