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-24 01:04:31 +00:00
parent 302a4e7701
commit 5609356165
4 changed files with 16 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

@ -495,7 +495,6 @@ 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 !== '';
@ -543,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 = task_parameter_serializer_1.TaskParameterSerializer.readBuildParameterFromEnvironment(); __1.CloudRunner.buildParameters = await __1.BuildParameters.create();
buildParameter.buildGuid = process.env['CI_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(__1.CloudRunner.buildParameters, undefined, 4)}
`); `);
__1.CloudRunner.buildParameters = buildParameter; __1.CloudRunner.lockedWorkspace = process.env.CI_LOCKED_WORKSPACE || process.env.LOCKED_WORKSPACE || ``;
__1.CloudRunner.lockedWorkspace = process.env.CI_LOCKED_WORKSPACE || ``; cloud_runner_logger_1.default.log(`Locked Workspace: ${__1.CloudRunner.lockedWorkspace}`);
await __1.CloudRunner.setup(buildParameter); await __1.CloudRunner.setup(__1.CloudRunner.buildParameters);
return await results.target[results.propertyKey](Cli.options); return await results.target[results.propertyKey](Cli.options);
} }
static logInput() { static logInput() {
@ -3757,7 +3755,8 @@ const cloud_runner_system_1 = __nccwpck_require__(99393);
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144)); const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
class KubernetesTaskRunner { class KubernetesTaskRunner {
static async runTask(kubeConfig, kubeClient, jobName, podName, containerName, namespace, alreadyFinished = false) { static async runTask(kubeConfig, kubeClient, jobName, podName, containerName, namespace, alreadyFinished = false) {
cloud_runner_logger_1.default.log(`Streaming logs from pod: ${podName} container: ${containerName} namespace: ${namespace} finished ${alreadyFinished} kubeVol ${cloud_runner_1.default.buildParameters.kubeVolumeSize} ${cloud_runner_1.default.buildParameters.containerCpu} ${cloud_runner_1.default.buildParameters.containerMemory}`); const lastReceivedMessage = this.lastReceivedMessage !== `` ? `\nLast Log Message"${this.lastReceivedMessage}"` : ``;
cloud_runner_logger_1.default.log(`Streaming logs from pod: ${podName} container: ${containerName} namespace: ${namespace} finished ${alreadyFinished} ${cloud_runner_1.default.buildParameters.kubeVolumeSize}/${cloud_runner_1.default.buildParameters.containerCpu}/${cloud_runner_1.default.buildParameters.containerMemory}\n${lastReceivedMessage}`);
let output = ''; let output = '';
let didStreamAnyLogs = false; let didStreamAnyLogs = false;
let shouldReadLogs = true; let shouldReadLogs = true;

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -14,7 +14,6 @@ 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;
@ -73,14 +72,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(); CloudRunner.buildParameters = await BuildParameters.create();
buildParameter.buildGuid = process.env['CI_BUILD_GUID'] || ``;
CloudRunnerLogger.log(`Build Params: CloudRunnerLogger.log(`Build Params:
${JSON.stringify(buildParameter, undefined, 4)} ${JSON.stringify(CloudRunner.buildParameters, undefined, 4)}
`); `);
CloudRunner.buildParameters = buildParameter; CloudRunner.lockedWorkspace = process.env.CI_LOCKED_WORKSPACE || process.env.LOCKED_WORKSPACE || ``;
CloudRunner.lockedWorkspace = process.env.CI_LOCKED_WORKSPACE || ``; CloudRunnerLogger.log(`Locked Workspace: ${CloudRunner.lockedWorkspace}`);
await CloudRunner.setup(buildParameter); await CloudRunner.setup(CloudRunner.buildParameters);
return await results.target[results.propertyKey](Cli.options); return await results.target[results.propertyKey](Cli.options);
} }

4
src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts
View File

@ -18,8 +18,10 @@ class KubernetesTaskRunner {
namespace: string, namespace: string,
alreadyFinished: boolean = false, alreadyFinished: boolean = false,
) { ) {
const lastReceivedMessage =
this.lastReceivedMessage !== `` ? `\nLast Log Message"${this.lastReceivedMessage}"` : ``;
CloudRunnerLogger.log( CloudRunnerLogger.log(
`Streaming logs from pod: ${podName} container: ${containerName} namespace: ${namespace} finished ${alreadyFinished} kubeVol ${CloudRunner.buildParameters.kubeVolumeSize} ${CloudRunner.buildParameters.containerCpu} ${CloudRunner.buildParameters.containerMemory}`, `Streaming logs from pod: ${podName} container: ${containerName} namespace: ${namespace} finished ${alreadyFinished} ${CloudRunner.buildParameters.kubeVolumeSize}/${CloudRunner.buildParameters.containerCpu}/${CloudRunner.buildParameters.containerMemory}\n${lastReceivedMessage}`,
); );
let output = ''; let output = '';
let didStreamAnyLogs: boolean = false; let didStreamAnyLogs: boolean = false;