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

Prefer \n to \r\n

pull/310/head
Frostebite 2021-12-29 14:35:13 +00:00
parent 4c38ffd178
commit 156a9de7eb
7 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dist/index.js vendored
View File

@ -411,7 +411,7 @@ class CLI {
const program = new commander_ts_1.Command(); const program = new commander_ts_1.Command();
program.version('0.0.1'); program.version('0.0.1');
const properties = Object.getOwnPropertyNames(__1.Input); const properties = Object.getOwnPropertyNames(__1.Input);
core.info(`\r\n`); core.info(`\n`);
core.info(`INPUT:`); core.info(`INPUT:`);
for (const element of properties) { for (const element of properties) {
// TODO pull description from action.yml // TODO pull description from action.yml
@ -420,7 +420,7 @@ class CLI {
core.info(`${element} ${__1.Input[element]}`); core.info(`${element} ${__1.Input[element]}`);
} }
} }
core.info(`\r\n`); core.info(`\n`);
program.option('-m, --mode <mode>', 'cli or default'); program.option('-m, --mode <mode>', 'cli or default');
program.parse(process.argv); program.parse(process.argv);
return program.opts(); return program.opts();
@ -565,11 +565,11 @@ class CloudRunnerAgentSystem {
let output = ''; let output = '';
const child = child_process_1.exec(command, (error, stdout, stderr) => { const child = child_process_1.exec(command, (error, stdout, stderr) => {
if (error) { if (error) {
cloud_runner_logger_1.default.logCli(`[ERROR] ${error.message}`); cloud_runner_logger_1.default.logCliError(`${error.message}`);
throw new Error(error.toString()); throw new Error(error.toString());
} }
if (stderr) { if (stderr) {
cloud_runner_logger_1.default.logCli(`[DIAGNOSTIC] ${stderr.toString()}`); cloud_runner_logger_1.default.logCliDiagnostic(`${stderr.toString()}`);
return; return;
} }
const outputChunk = `${stdout}`; const outputChunk = `${stdout}`;
@ -1339,7 +1339,7 @@ class AWSTaskRunner {
} }
message = `[${cloud_runner_statics_1.CloudRunnerStatics.logPrefix}] ${message}`; message = `[${cloud_runner_statics_1.CloudRunnerStatics.logPrefix}] ${message}`;
if (cloud_runner_state_1.CloudRunnerState.buildParams.logToFile) { if (cloud_runner_state_1.CloudRunnerState.buildParams.logToFile) {
fs_1.default.appendFileSync(`${cloud_runner_state_1.CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\r\n`); fs_1.default.appendFileSync(`${cloud_runner_state_1.CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\n`);
} }
cloud_runner_logger_1.default.log(message); cloud_runner_logger_1.default.log(message);
} }
@ -2036,7 +2036,7 @@ class KubernetesLogging {
let message = chunk.toString(); let message = chunk.toString();
message = `[${cloud_runner_statics_1.CloudRunnerStatics.logPrefix}] ${message}`; message = `[${cloud_runner_statics_1.CloudRunnerStatics.logPrefix}] ${message}`;
if (cloud_runner_state_1.CloudRunnerState.buildParams.logToFile) { if (cloud_runner_state_1.CloudRunnerState.buildParams.logToFile) {
fs_1.default.appendFileSync(`${cloud_runner_state_1.CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\r\n`); fs_1.default.appendFileSync(`${cloud_runner_state_1.CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\n`);
} }
logCallback(message); logCallback(message);
next(); next();
@ -2448,6 +2448,12 @@ class CloudRunnerLogger {
static logCli(message) { static logCli(message) {
CloudRunnerLogger.log(`[Client] ${message}`); CloudRunnerLogger.log(`[Client] ${message}`);
} }
static logCliError(message) {
CloudRunnerLogger.log(`[Client][Error] ${message}`);
}
static logCliDiagnostic(message) {
CloudRunnerLogger.log(`[Client][Diagnostic] ${message}`);
}
static logLine(message) { static logLine(message) {
core.info(`${message}\n`); core.info(`${message}\n`);
} }

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -32,7 +32,7 @@ export class CLI {
const program = new Command(); const program = new Command();
program.version('0.0.1'); program.version('0.0.1');
const properties = Object.getOwnPropertyNames(Input); const properties = Object.getOwnPropertyNames(Input);
core.info(`\r\n`); core.info(`\n`);
core.info(`INPUT:`); core.info(`INPUT:`);
for (const element of properties) { for (const element of properties) {
// TODO pull description from action.yml // TODO pull description from action.yml
@ -41,7 +41,7 @@ export class CLI {
core.info(`${element} ${Input[element]}`); core.info(`${element} ${Input[element]}`);
} }
} }
core.info(`\r\n`); core.info(`\n`);
program.option('-m, --mode <mode>', 'cli or default'); program.option('-m, --mode <mode>', 'cli or default');
program.parse(process.argv); program.parse(process.argv);

4
src/model/cli/remote-client/cloud-runner-agent-system.ts
View File

@ -8,11 +8,11 @@ export class CloudRunnerAgentSystem {
let output = ''; let output = '';
const child = exec(command, (error, stdout, stderr) => { const child = exec(command, (error, stdout, stderr) => {
if (error) { if (error) {
CloudRunnerLogger.logCli(`[ERROR] ${error.message}`); CloudRunnerLogger.logCliError(`${error.message}`);
throw new Error(error.toString()); throw new Error(error.toString());
} }
if (stderr) { if (stderr) {
CloudRunnerLogger.logCli(`[DIAGNOSTIC] ${stderr.toString()}`); CloudRunnerLogger.logCliDiagnostic(`${stderr.toString()}`);
return; return;
} }
const outputChunk = `${stdout}`; const outputChunk = `${stdout}`;

2
src/model/cloud-runner/aws/aws-task-runner.ts
View File

@ -181,7 +181,7 @@ class AWSTaskRunner {
} }
message = `[${CloudRunnerStatics.logPrefix}] ${message}`; message = `[${CloudRunnerStatics.logPrefix}] ${message}`;
if (CloudRunnerState.buildParams.logToFile) { if (CloudRunnerState.buildParams.logToFile) {
fs.appendFileSync(`${CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\r\n`); fs.appendFileSync(`${CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\n`);
} }
CloudRunnerLogger.log(message); CloudRunnerLogger.log(message);
} }

2
src/model/cloud-runner/k8s/kubernetes-logging.ts
View File

@ -22,7 +22,7 @@ class KubernetesLogging {
let message = chunk.toString(); let message = chunk.toString();
message = `[${CloudRunnerStatics.logPrefix}] ${message}`; message = `[${CloudRunnerStatics.logPrefix}] ${message}`;
if (CloudRunnerState.buildParams.logToFile) { if (CloudRunnerState.buildParams.logToFile) {
fs.appendFileSync(`${CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\r\n`); fs.appendFileSync(`${CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\n`);
} }
logCallback(message); logCallback(message);
next(); next();

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

@ -17,6 +17,14 @@ class CloudRunnerLogger {
CloudRunnerLogger.log(`[Client] ${message}`); CloudRunnerLogger.log(`[Client] ${message}`);
} }
public static logCliError(message: string) {
CloudRunnerLogger.log(`[Client][Error] ${message}`);
}
public static logCliDiagnostic(message: string) {
CloudRunnerLogger.log(`[Client][Diagnostic] ${message}`);
}
public static logLine(message: string) { public static logLine(message: string) {
core.info(`${message}\n`); core.info(`${message}\n`);
} }