pr feedback
parent
9bfb4dff07
commit
37495c11b9
|
|
@ -5633,11 +5633,16 @@ class RemoteClient {
|
||||||
await remote_client_logger_1.RemoteClientLogger.handleLogManagementPostJob();
|
await remote_client_logger_1.RemoteClientLogger.handleLogManagementPostJob();
|
||||||
// Ensure success marker is present in logs for tests
|
// Ensure success marker is present in logs for tests
|
||||||
// For K8s, kubectl logs reads from stdout/stderr, so we must write to stdout
|
// For K8s, kubectl logs reads from stdout/stderr, so we must write to stdout
|
||||||
|
// For all providers, we write to stdout so it gets piped through the log stream
|
||||||
|
// The log stream will capture it and add it to BuildResults
|
||||||
const successMessage = `Activation successful`;
|
const successMessage = `Activation successful`;
|
||||||
// Write to stdout first so kubectl logs can capture it
|
// Write to stdout so it gets piped through remote-cli-log-stream when invoked via pipe
|
||||||
|
// This ensures the message is captured in BuildResults for all providers
|
||||||
// Stdout flushes automatically on newline
|
// Stdout flushes automatically on newline
|
||||||
process.stdout.write(`${successMessage}\n`);
|
process.stdout.write(`${successMessage}\n`);
|
||||||
// Also log via CloudRunnerLogger for GitHub Actions
|
// Also log via CloudRunnerLogger and RemoteClientLogger for GitHub Actions and log file
|
||||||
|
// This ensures the message appears in log files for providers that read from log files
|
||||||
|
remote_client_logger_1.RemoteClientLogger.log(successMessage);
|
||||||
cloud_runner_logger_1.default.log(successMessage);
|
cloud_runner_logger_1.default.log(successMessage);
|
||||||
return new Promise((result) => result(``));
|
return new Promise((result) => result(``));
|
||||||
}
|
}
|
||||||
|
|
@ -7492,8 +7497,9 @@ echo "CACHE_KEY=$CACHE_KEY"`;
|
||||||
{ echo "game ci start"; echo "game ci start" >> /home/job-log.txt; echo "CACHE_KEY=$CACHE_KEY"; echo "$CACHE_KEY"; if [ -n "$LOCKED_WORKSPACE" ]; then echo "Retained Workspace: true"; fi; if [ -n "$LOCKED_WORKSPACE" ] && [ -d "$GITHUB_WORKSPACE/.git" ]; then echo "Retained Workspace Already Exists!"; fi; /entrypoint.sh; } | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt
|
{ echo "game ci start"; echo "game ci start" >> /home/job-log.txt; echo "CACHE_KEY=$CACHE_KEY"; echo "$CACHE_KEY"; if [ -n "$LOCKED_WORKSPACE" ]; then echo "Retained Workspace: true"; fi; if [ -n "$LOCKED_WORKSPACE" ] && [ -d "$GITHUB_WORKSPACE/.git" ]; then echo "Retained Workspace Already Exists!"; fi; /entrypoint.sh; } | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt
|
||||||
# Run post-build and ensure output is captured in logs
|
# Run post-build and ensure output is captured in logs
|
||||||
node ${builderPath} -m remote-cli-post-build | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt || true
|
node ${builderPath} -m remote-cli-post-build | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt || true
|
||||||
echo "end of cloud runner job"
|
# Write end marker through log stream to ensure it's captured in BuildResults
|
||||||
echo "---${cloud_runner_1.default.buildParameters.logId}"`;
|
echo "end of cloud runner job" | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt
|
||||||
|
echo "---${cloud_runner_1.default.buildParameters.logId}" | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt`;
|
||||||
}
|
}
|
||||||
// prettier-ignore
|
// prettier-ignore
|
||||||
return `
|
return `
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -156,13 +156,18 @@ export class RemoteClient {
|
||||||
|
|
||||||
// Ensure success marker is present in logs for tests
|
// Ensure success marker is present in logs for tests
|
||||||
// For K8s, kubectl logs reads from stdout/stderr, so we must write to stdout
|
// For K8s, kubectl logs reads from stdout/stderr, so we must write to stdout
|
||||||
|
// For all providers, we write to stdout so it gets piped through the log stream
|
||||||
|
// The log stream will capture it and add it to BuildResults
|
||||||
const successMessage = `Activation successful`;
|
const successMessage = `Activation successful`;
|
||||||
|
|
||||||
// Write to stdout first so kubectl logs can capture it
|
// Write to stdout so it gets piped through remote-cli-log-stream when invoked via pipe
|
||||||
|
// This ensures the message is captured in BuildResults for all providers
|
||||||
// Stdout flushes automatically on newline
|
// Stdout flushes automatically on newline
|
||||||
process.stdout.write(`${successMessage}\n`);
|
process.stdout.write(`${successMessage}\n`);
|
||||||
|
|
||||||
// Also log via CloudRunnerLogger for GitHub Actions
|
// Also log via CloudRunnerLogger and RemoteClientLogger for GitHub Actions and log file
|
||||||
|
// This ensures the message appears in log files for providers that read from log files
|
||||||
|
RemoteClientLogger.log(successMessage);
|
||||||
CloudRunnerLogger.log(successMessage);
|
CloudRunnerLogger.log(successMessage);
|
||||||
|
|
||||||
return new Promise((result) => result(``));
|
return new Promise((result) => result(``));
|
||||||
|
|
|
||||||
|
|
@ -201,8 +201,9 @@ echo "CACHE_KEY=$CACHE_KEY"`;
|
||||||
{ echo "game ci start"; echo "game ci start" >> /home/job-log.txt; echo "CACHE_KEY=$CACHE_KEY"; echo "$CACHE_KEY"; if [ -n "$LOCKED_WORKSPACE" ]; then echo "Retained Workspace: true"; fi; if [ -n "$LOCKED_WORKSPACE" ] && [ -d "$GITHUB_WORKSPACE/.git" ]; then echo "Retained Workspace Already Exists!"; fi; /entrypoint.sh; } | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt
|
{ echo "game ci start"; echo "game ci start" >> /home/job-log.txt; echo "CACHE_KEY=$CACHE_KEY"; echo "$CACHE_KEY"; if [ -n "$LOCKED_WORKSPACE" ]; then echo "Retained Workspace: true"; fi; if [ -n "$LOCKED_WORKSPACE" ] && [ -d "$GITHUB_WORKSPACE/.git" ]; then echo "Retained Workspace Already Exists!"; fi; /entrypoint.sh; } | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt
|
||||||
# Run post-build and ensure output is captured in logs
|
# Run post-build and ensure output is captured in logs
|
||||||
node ${builderPath} -m remote-cli-post-build | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt || true
|
node ${builderPath} -m remote-cli-post-build | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt || true
|
||||||
echo "end of cloud runner job"
|
# Write end marker through log stream to ensure it's captured in BuildResults
|
||||||
echo "---${CloudRunner.buildParameters.logId}"`;
|
echo "end of cloud runner job" | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt
|
||||||
|
echo "---${CloudRunner.buildParameters.logId}" | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// prettier-ignore
|
// prettier-ignore
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue