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

fixes

pull/524/head
Frostebite 2023-03-15 18:14:12 +00:00
parent bfe6559ffa
commit 60e2147f85
7 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dist/index.js generated vendored
View File

@ -494,6 +494,7 @@ const cloud_runner_options_reader_1 = __importDefault(__nccwpck_require__(3343))
const github_1 = __importDefault(__nccwpck_require__(83654)); const github_1 = __importDefault(__nccwpck_require__(83654));
const cloud_runner_folders_1 = __nccwpck_require__(13527); const cloud_runner_folders_1 = __nccwpck_require__(13527);
const cloud_runner_system_1 = __nccwpck_require__(99393); const cloud_runner_system_1 = __nccwpck_require__(99393);
const task_parameter_serializer_1 = __nccwpck_require__(35346);
class Cli { class Cli {
static get isCliMode() { static get isCliMode() {
return Cli.options !== undefined && Cli.options.mode !== undefined && Cli.options.mode !== ''; return Cli.options !== undefined && Cli.options.mode !== undefined && Cli.options.mode !== '';
@ -528,7 +529,7 @@ class Cli {
program.option('--select <select>', 'select a particular resource'); program.option('--select <select>', 'select a particular resource');
program.parse(process.argv); program.parse(process.argv);
Cli.options = program.opts(); Cli.options = program.opts();
return Cli.isCliMode || process.env.GAMECI_CLI; return Cli.isCliMode || process.env.CI_CLI;
} }
static async RunCli() { static async RunCli() {
github_1.default.githubInputEnabled = false; github_1.default.githubInputEnabled = false;
@ -541,14 +542,13 @@ class Cli {
const results = cli_functions_repository_1.CliFunctionsRepository.GetCliFunctions(Cli.options?.mode); const results = cli_functions_repository_1.CliFunctionsRepository.GetCliFunctions(Cli.options?.mode);
cloud_runner_logger_1.default.log(`Entrypoint: ${results.key}`); cloud_runner_logger_1.default.log(`Entrypoint: ${results.key}`);
Cli.options.versioning = 'None'; Cli.options.versioning = 'None';
// const buildParameter = TaskParameterSerializer.readBuildParameterFromEnvironment(); const buildParameter = task_parameter_serializer_1.TaskParameterSerializer.readBuildParameterFromEnvironment();
const buildParameter = await __1.BuildParameters.create(); buildParameter.buildGuid = process.env['CI_BUILD_GUID'] || ``;
buildParameter.buildGuid = process.env['GAMECI_BUILD_GUID'] || ``;
cloud_runner_logger_1.default.log(`Build Params: cloud_runner_logger_1.default.log(`Build Params:
${JSON.stringify(buildParameter, undefined, 4)} ${JSON.stringify(buildParameter, undefined, 4)}
`); `);
__1.CloudRunner.buildParameters = buildParameter; __1.CloudRunner.buildParameters = buildParameter;
__1.CloudRunner.lockedWorkspace = process.env.GAMECI_LOCKED_WORKSPACE; __1.CloudRunner.lockedWorkspace = process.env.CI_LOCKED_WORKSPACE;
await __1.CloudRunner.setup(buildParameter); await __1.CloudRunner.setup(buildParameter);
return await results.target[results.propertyKey](Cli.options); return await results.target[results.propertyKey](Cli.options);
} }
@ -697,8 +697,8 @@ class CloudRunnerOptions {
if (process.env[query] !== undefined) { if (process.env[query] !== undefined) {
return process.env[query]; return process.env[query];
} }
if (alternativeQuery !== query && process.env[`GAMECI_${alternativeQuery}`] !== undefined) { if (alternativeQuery !== query && process.env[`CI_${alternativeQuery}`] !== undefined) {
return process.env[`GAMECI_${alternativeQuery}`]; return process.env[`CI_${alternativeQuery}`];
} }
if (alternativeQuery !== query && process.env[alternativeQuery] !== undefined) { if (alternativeQuery !== query && process.env[alternativeQuery] !== undefined) {
return process.env[alternativeQuery]; return process.env[alternativeQuery];
@ -1006,7 +1006,7 @@ class CloudRunner {
return process.env[`GITHUB_ACTIONS`] !== `true`; return process.env[`GITHUB_ACTIONS`] !== `true`;
} }
static get isCloudRunnerAsyncEnvironment() { static get isCloudRunnerAsyncEnvironment() {
return process.env[`GAMECI_ASYNC_WORKFLOW`] === `true`; return process.env[`CI_ASYNC_WORKFLOW`] === `true`;
} }
static async setup(buildParameters) { static async setup(buildParameters) {
cloud_runner_logger_1.default.setup(); cloud_runner_logger_1.default.setup();
@ -1067,7 +1067,7 @@ class CloudRunner {
cloud_runner_logger_1.default.logLine(`Using retained workspace ${CloudRunner.lockedWorkspace}`); cloud_runner_logger_1.default.logLine(`Using retained workspace ${CloudRunner.lockedWorkspace}`);
CloudRunner.cloudRunnerEnvironmentVariables = [ CloudRunner.cloudRunnerEnvironmentVariables = [
...CloudRunner.cloudRunnerEnvironmentVariables, ...CloudRunner.cloudRunnerEnvironmentVariables,
{ name: `GAMECI_LOCKED_WORKSPACE`, value: CloudRunner.lockedWorkspace }, { name: `CI_LOCKED_WORKSPACE`, value: CloudRunner.lockedWorkspace },
]; ];
} }
else { else {
@ -5501,7 +5501,7 @@ class TaskParameterSerializer {
x.value !== '' && x.value !== '' &&
x.value !== undefined && x.value !== undefined &&
x.name !== `CUSTOM_JOB` && x.name !== `CUSTOM_JOB` &&
x.name !== `GAMECI_CUSTOM_JOB` && x.name !== `CI_CUSTOM_JOB` &&
x.value !== `false` && x.value !== `false` &&
x.value !== `undefined`) x.value !== `undefined`)
.map((x) => { .map((x) => {
@ -5523,12 +5523,12 @@ class TaskParameterSerializer {
const buildParameters = new build_parameters_1.default(); const buildParameters = new build_parameters_1.default();
const keys = [ const keys = [
...new Set(Object.getOwnPropertyNames(process.env) ...new Set(Object.getOwnPropertyNames(process.env)
.filter((x) => !this.blocked.has(x) && x.startsWith('GAMECI_')) .filter((x) => !this.blocked.has(x) && x.startsWith('CI_'))
.map((x) => TaskParameterSerializer.UndoEnvVarFormat(x))), .map((x) => TaskParameterSerializer.UndoEnvVarFormat(x))),
]; ];
for (const element of keys) { for (const element of keys) {
if (element !== `customJob`) { if (element !== `customJob`) {
buildParameters[element] = process.env[`GAMECI_${TaskParameterSerializer.ToEnvVarFormat(element)}`]; buildParameters[element] = process.env[`CI_${TaskParameterSerializer.ToEnvVarFormat(element)}`];
} }
} }
return buildParameters; return buildParameters;
@ -5540,7 +5540,7 @@ class TaskParameterSerializer {
return cloud_runner_options_1.default.ToEnvVarFormat(input); return cloud_runner_options_1.default.ToEnvVarFormat(input);
} }
static UndoEnvVarFormat(element) { static UndoEnvVarFormat(element) {
return this.camelize(element.replace('GAMECI_', '').toLowerCase().replace(/_+/g, ' ')); return this.camelize(element.replace('CI_', '').toLowerCase().replace(/_+/g, ' '));
} }
static camelize(string) { static camelize(string) {
return string return string
@ -5554,7 +5554,7 @@ class TaskParameterSerializer {
const keys = Object.getOwnPropertyNames(buildParameters).filter((x) => !this.blocked.has(x)); const keys = Object.getOwnPropertyNames(buildParameters).filter((x) => !this.blocked.has(x));
for (const element of keys) { for (const element of keys) {
array.push({ array.push({
name: `GAMECI_${TaskParameterSerializer.ToEnvVarFormat(element)}`, name: `CI_${TaskParameterSerializer.ToEnvVarFormat(element)}`,
value: buildParameters[element], value: buildParameters[element],
}); });
} }
@ -5625,7 +5625,7 @@ class AsyncWorkflow {
try { try {
cloud_runner_logger_1.default.log(`Cloud Runner is running async mode`); cloud_runner_logger_1.default.log(`Cloud Runner is running async mode`);
const asyncEnvironmentVariable = new cloud_runner_environment_variable_1.default(); const asyncEnvironmentVariable = new cloud_runner_environment_variable_1.default();
asyncEnvironmentVariable.name = `GAMECI_ASYNC_WORKFLOW`; asyncEnvironmentVariable.name = `CI_ASYNC_WORKFLOW`;
asyncEnvironmentVariable.value = `true`; asyncEnvironmentVariable.value = `true`;
let output = ''; let output = '';
output += await cloud_runner_1.default.Provider.runTaskInWorkflow(cloud_runner_1.default.buildParameters.buildGuid, `ubuntu`, `apt-get update > /dev/null output += await cloud_runner_1.default.Provider.runTaskInWorkflow(cloud_runner_1.default.buildParameters.buildGuid, `ubuntu`, `apt-get update > /dev/null

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

File diff suppressed because one or more lines are too long

10
src/model/cli/cli.ts
View File

@ -14,6 +14,7 @@ import { CloudRunnerFolders } from '../cloud-runner/services/cloud-runner-folder
import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system'; import { CloudRunnerSystem } from '../cloud-runner/services/cloud-runner-system';
import { OptionValues } from 'commander'; import { OptionValues } from 'commander';
import { InputKey } from '../input'; import { InputKey } from '../input';
import { TaskParameterSerializer } from '../cloud-runner/services/task-parameter-serializer';
export class Cli { export class Cli {
public static options: OptionValues | undefined; public static options: OptionValues | undefined;
@ -57,7 +58,7 @@ export class Cli {
program.parse(process.argv); program.parse(process.argv);
Cli.options = program.opts(); Cli.options = program.opts();
return Cli.isCliMode || process.env.GAMECI_CLI; return Cli.isCliMode || process.env.CI_CLI;
} }
static async RunCli(): Promise<void> { static async RunCli(): Promise<void> {
@ -72,14 +73,13 @@ export class Cli {
CloudRunnerLogger.log(`Entrypoint: ${results.key}`); CloudRunnerLogger.log(`Entrypoint: ${results.key}`);
Cli.options!.versioning = 'None'; Cli.options!.versioning = 'None';
// const buildParameter = TaskParameterSerializer.readBuildParameterFromEnvironment(); const buildParameter = TaskParameterSerializer.readBuildParameterFromEnvironment();
const buildParameter = await BuildParameters.create(); buildParameter.buildGuid = process.env['CI_BUILD_GUID'] || ``;
buildParameter.buildGuid = process.env['GAMECI_BUILD_GUID'] || ``;
CloudRunnerLogger.log(`Build Params: CloudRunnerLogger.log(`Build Params:
${JSON.stringify(buildParameter, undefined, 4)} ${JSON.stringify(buildParameter, undefined, 4)}
`); `);
CloudRunner.buildParameters = buildParameter; CloudRunner.buildParameters = buildParameter;
CloudRunner.lockedWorkspace = process.env.GAMECI_LOCKED_WORKSPACE; CloudRunner.lockedWorkspace = process.env.CI_LOCKED_WORKSPACE;
await CloudRunner.setup(buildParameter); await CloudRunner.setup(buildParameter);
return await results.target[results.propertyKey](Cli.options); return await results.target[results.propertyKey](Cli.options);

4
src/model/cloud-runner/cloud-runner-options.ts
View File

@ -29,8 +29,8 @@ class CloudRunnerOptions {
return process.env[query]; return process.env[query];
} }
if (alternativeQuery !== query && process.env[`GAMECI_${alternativeQuery}`] !== undefined) { if (alternativeQuery !== query && process.env[`CI_${alternativeQuery}`] !== undefined) {
return process.env[`GAMECI_${alternativeQuery}`]; return process.env[`CI_${alternativeQuery}`];
} }
if (alternativeQuery !== query && process.env[alternativeQuery] !== undefined) { if (alternativeQuery !== query && process.env[alternativeQuery] !== undefined) {

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

@ -27,7 +27,7 @@ class CloudRunner {
return process.env[`GITHUB_ACTIONS`] !== `true`; return process.env[`GITHUB_ACTIONS`] !== `true`;
} }
public static get isCloudRunnerAsyncEnvironment() { public static get isCloudRunnerAsyncEnvironment() {
return process.env[`GAMECI_ASYNC_WORKFLOW`] === `true`; return process.env[`CI_ASYNC_WORKFLOW`] === `true`;
} }
public static async setup(buildParameters: BuildParameters) { public static async setup(buildParameters: BuildParameters) {
CloudRunnerLogger.setup(); CloudRunnerLogger.setup();
@ -104,7 +104,7 @@ class CloudRunner {
CloudRunnerLogger.logLine(`Using retained workspace ${CloudRunner.lockedWorkspace}`); CloudRunnerLogger.logLine(`Using retained workspace ${CloudRunner.lockedWorkspace}`);
CloudRunner.cloudRunnerEnvironmentVariables = [ CloudRunner.cloudRunnerEnvironmentVariables = [
...CloudRunner.cloudRunnerEnvironmentVariables, ...CloudRunner.cloudRunnerEnvironmentVariables,
{ name: `GAMECI_LOCKED_WORKSPACE`, value: CloudRunner.lockedWorkspace }, { name: `CI_LOCKED_WORKSPACE`, value: CloudRunner.lockedWorkspace },
]; ];
} else { } else {
CloudRunnerLogger.log(`Max retained workspaces reached ${buildParameters.maxRetainedWorkspaces}`); CloudRunnerLogger.log(`Max retained workspaces reached ${buildParameters.maxRetainedWorkspaces}`);

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

@ -36,7 +36,7 @@ export class TaskParameterSerializer {
x.value !== '' && x.value !== '' &&
x.value !== undefined && x.value !== undefined &&
x.name !== `CUSTOM_JOB` && x.name !== `CUSTOM_JOB` &&
x.name !== `GAMECI_CUSTOM_JOB` && x.name !== `CI_CUSTOM_JOB` &&
x.value !== `false` && x.value !== `false` &&
x.value !== `undefined`, x.value !== `undefined`,
) )
@ -68,14 +68,14 @@ export class TaskParameterSerializer {
const keys = [ const keys = [
...new Set( ...new Set(
Object.getOwnPropertyNames(process.env) Object.getOwnPropertyNames(process.env)
.filter((x) => !this.blocked.has(x) && x.startsWith('GAMECI_')) .filter((x) => !this.blocked.has(x) && x.startsWith('CI_'))
.map((x) => TaskParameterSerializer.UndoEnvVarFormat(x)), .map((x) => TaskParameterSerializer.UndoEnvVarFormat(x)),
), ),
]; ];
for (const element of keys) { for (const element of keys) {
if (element !== `customJob`) { if (element !== `customJob`) {
buildParameters[element] = process.env[`GAMECI_${TaskParameterSerializer.ToEnvVarFormat(element)}`]; buildParameters[element] = process.env[`CI_${TaskParameterSerializer.ToEnvVarFormat(element)}`];
} }
} }
@ -91,7 +91,7 @@ export class TaskParameterSerializer {
} }
public static UndoEnvVarFormat(element: string): string { public static UndoEnvVarFormat(element: string): string {
return this.camelize(element.replace('GAMECI_', '').toLowerCase().replace(/_+/g, ' ')); return this.camelize(element.replace('CI_', '').toLowerCase().replace(/_+/g, ' '));
} }
private static camelize(string: string) { private static camelize(string: string) {
@ -107,7 +107,7 @@ export class TaskParameterSerializer {
const keys = Object.getOwnPropertyNames(buildParameters).filter((x) => !this.blocked.has(x)); const keys = Object.getOwnPropertyNames(buildParameters).filter((x) => !this.blocked.has(x));
for (const element of keys) { for (const element of keys) {
array.push({ array.push({
name: `GAMECI_${TaskParameterSerializer.ToEnvVarFormat(element)}`, name: `CI_${TaskParameterSerializer.ToEnvVarFormat(element)}`,
value: buildParameters[element], value: buildParameters[element],
}); });
} }

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

@ -12,7 +12,7 @@ export class AsyncWorkflow {
try { try {
CloudRunnerLogger.log(`Cloud Runner is running async mode`); CloudRunnerLogger.log(`Cloud Runner is running async mode`);
const asyncEnvironmentVariable = new CloudRunnerEnvironmentVariable(); const asyncEnvironmentVariable = new CloudRunnerEnvironmentVariable();
asyncEnvironmentVariable.name = `GAMECI_ASYNC_WORKFLOW`; asyncEnvironmentVariable.name = `CI_ASYNC_WORKFLOW`;
asyncEnvironmentVariable.value = `true`; asyncEnvironmentVariable.value = `true`;
let output = ''; let output = '';