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

shorter names

pull/524/head
Frostebite 2023-03-20 00:00:16 +00:00
parent 2c812ea980
commit 082df959ae
6 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dist/index.js generated vendored
View File

@ -1499,7 +1499,6 @@ class AWSJobStack {
Capabilities: ['CAPABILITY_IAM'],
Parameters: parameters,
};
cloud_runner_logger_1.default.log(`AWS Params ${JSON.stringify(parameters, undefined, 4)}`);
try {
cloud_runner_logger_1.default.log(`Creating job aws formation ${taskDefStackName}`);
await CF.createStack(createStackInput).promise();
@ -4765,7 +4764,7 @@ class CloudRunnerCustomSteps {
if (steps.length > 0) {
if (!cloud_runner_1.default.buildParameters.isCliMode)
core.startGroup('post build steps');
output += await custom_workflow_1.CustomWorkflow.runCustomJob(steps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
output += await custom_workflow_1.CustomWorkflow.runContainerJob(steps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
if (!cloud_runner_1.default.buildParameters.isCliMode)
core.endGroup();
}
@ -4780,7 +4779,7 @@ class CloudRunnerCustomSteps {
if (steps.length > 0) {
if (!cloud_runner_1.default.buildParameters.isCliMode)
core.startGroup('pre build steps');
output += await custom_workflow_1.CustomWorkflow.runCustomJob(steps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
output += await custom_workflow_1.CustomWorkflow.runContainerJob(steps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
if (!cloud_runner_1.default.buildParameters.isCliMode)
core.endGroup();
}
@ -5839,17 +5838,17 @@ const cloud_runner_folders_1 = __nccwpck_require__(13527);
const cloud_runner_custom_steps_1 = __nccwpck_require__(96455);
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
class CustomWorkflow {
static async runCustomJobFromString(buildSteps, environmentVariables, secrets) {
return await CustomWorkflow.runCustomJob(cloud_runner_custom_steps_1.CloudRunnerCustomSteps.ParseSteps(buildSteps), environmentVariables, secrets);
static async runContainerJobFromString(buildSteps, environmentVariables, secrets) {
return await CustomWorkflow.runContainerJob(cloud_runner_custom_steps_1.CloudRunnerCustomSteps.ParseSteps(buildSteps), environmentVariables, secrets);
}
static async runCustomJob(buildSteps, environmentVariables, secrets) {
static async runContainerJob(steps, environmentVariables, secrets) {
try {
let output = '';
// if (CloudRunner.buildParameters?.cloudRunnerDebug) {
// CloudRunnerLogger.log(`Custom Job Description \n${JSON.stringify(buildSteps, undefined, 4)}`);
// }
for (const step of buildSteps) {
cloud_runner_logger_1.default.log(`Cloud Runner is running in custom job mode Secrets Count:${JSON.stringify([...secrets, ...step.secrets], undefined, 4)} Env Var Count:${JSON.stringify(environmentVariables, undefined, 4)}`);
for (const step of steps) {
cloud_runner_logger_1.default.log(`Cloud Runner is running in custom job mode`);
output += await cloud_runner_1.default.Provider.runTaskInWorkflow(cloud_runner_1.default.buildParameters.buildGuid, step.image, step.commands, `/${cloud_runner_folders_1.CloudRunnerFolders.buildVolumeFolder}`, `/${cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute}/`, environmentVariables, [...secrets, ...step.secrets]);
}
return output;
@ -5889,7 +5888,7 @@ class WorkflowCompositionRoot {
return await async_workflow_1.AsyncWorkflow.runAsyncWorkflow(cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
}
if (cloud_runner_1.default.buildParameters.customJob !== '') {
return await custom_workflow_1.CustomWorkflow.runCustomJobFromString(cloud_runner_1.default.buildParameters.customJob, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
return await custom_workflow_1.CustomWorkflow.runContainerJobFromString(cloud_runner_1.default.buildParameters.customJob, cloudRunnerStepState.environment, cloudRunnerStepState.secrets);
}
return await new build_automation_workflow_1.BuildAutomationWorkflow().run(new cloud_runner_step_state_1.CloudRunnerStepState(cloudRunnerStepState.image.toString(), cloudRunnerStepState.environment, cloudRunnerStepState.secrets));
}

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

2
src/model/cloud-runner/providers/aws/aws-job-stack.ts
View File

@ -140,8 +140,6 @@ export class AWSJobStack {
Capabilities: ['CAPABILITY_IAM'],
Parameters: parameters,
};
CloudRunnerLogger.log(`AWS Params ${JSON.stringify(parameters, undefined, 4)}`);
try {
CloudRunnerLogger.log(`Creating job aws formation ${taskDefStackName}`);
await CF.createStack(createStackInput).promise();

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

@ -239,7 +239,7 @@ export class CloudRunnerCustomSteps {
if (steps.length > 0) {
if (!CloudRunner.buildParameters.isCliMode) core.startGroup('post build steps');
output += await CustomWorkflow.runCustomJob(
output += await CustomWorkflow.runContainerJob(
steps,
cloudRunnerStepState.environment,
cloudRunnerStepState.secrets,
@ -258,7 +258,7 @@ export class CloudRunnerCustomSteps {
if (steps.length > 0) {
if (!CloudRunner.buildParameters.isCliMode) core.startGroup('pre build steps');
output += await CustomWorkflow.runCustomJob(
output += await CustomWorkflow.runContainerJob(
steps,
cloudRunnerStepState.environment,
cloudRunnerStepState.secrets,

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

@ -7,20 +7,20 @@ import { CustomStep } from '../services/custom-step';
import CloudRunner from '../cloud-runner';
export class CustomWorkflow {
public static async runCustomJobFromString(
public static async runContainerJobFromString(
buildSteps: string,
environmentVariables: CloudRunnerEnvironmentVariable[],
secrets: CloudRunnerSecret[],
): Promise<string> {
return await CustomWorkflow.runCustomJob(
return await CustomWorkflow.runContainerJob(
CloudRunnerCustomSteps.ParseSteps(buildSteps),
environmentVariables,
secrets,
);
}
public static async runCustomJob(
buildSteps: CustomStep[],
public static async runContainerJob(
steps: CustomStep[],
environmentVariables: CloudRunnerEnvironmentVariable[],
secrets: CloudRunnerSecret[],
) {
@ -30,14 +30,8 @@ export class CustomWorkflow {
// if (CloudRunner.buildParameters?.cloudRunnerDebug) {
// CloudRunnerLogger.log(`Custom Job Description \n${JSON.stringify(buildSteps, undefined, 4)}`);
// }
for (const step of buildSteps) {
CloudRunnerLogger.log(
`Cloud Runner is running in custom job mode Secrets Count:${JSON.stringify(
[...secrets, ...step.secrets],
undefined,
4,
)} Env Var Count:${JSON.stringify(environmentVariables, undefined, 4)}`,
);
for (const step of steps) {
CloudRunnerLogger.log(`Cloud Runner is running in custom job mode`);
output += await CloudRunner.Provider.runTaskInWorkflow(
CloudRunner.buildParameters.buildGuid,
step.image,

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

@ -18,7 +18,7 @@ export class WorkflowCompositionRoot implements WorkflowInterface {
}
if (CloudRunner.buildParameters.customJob !== '') {
return await CustomWorkflow.runCustomJobFromString(
return await CustomWorkflow.runContainerJobFromString(
CloudRunner.buildParameters.customJob,
cloudRunnerStepState.environment,
cloudRunnerStepState.secrets,