mirror of
https://github.com/game-ci/unity-builder.git
synced 2026-01-29 12:19:06 +08:00
pr feedback
This commit is contained in:
14
dist/index.js
generated
vendored
14
dist/index.js
generated
vendored
@@ -3213,6 +3213,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
exports.TaskService = void 0;
|
||||
const client_cloudformation_1 = __nccwpck_require__(15650);
|
||||
// eslint-disable-next-line import/named
|
||||
const client_cloudwatch_logs_1 = __nccwpck_require__(31573);
|
||||
const client_ecs_1 = __nccwpck_require__(18209);
|
||||
const client_s3_1 = __nccwpck_require__(19250);
|
||||
@@ -4004,9 +4005,9 @@ class KubernetesPods {
|
||||
errorDetails.push(`Recent events: ${JSON.stringify(events.slice(-5), undefined, 2)}`);
|
||||
}
|
||||
// Check if only PreStopHook failed but container succeeded
|
||||
const hasPreStopHookFailure = events.some((e) => e.reason === 'FailedPreStopHook');
|
||||
const wasKilled = events.some((e) => e.reason === 'Killing');
|
||||
const hasExceededGracePeriod = events.some((e) => e.reason === 'ExceededGracePeriod');
|
||||
const hasPreStopHookFailure = events.some((event) => event.reason === 'FailedPreStopHook');
|
||||
const wasKilled = events.some((event) => event.reason === 'Killing');
|
||||
const hasExceededGracePeriod = events.some((event) => event.reason === 'ExceededGracePeriod');
|
||||
// If container succeeded (exit code 0), PreStopHook failure is non-critical
|
||||
// Also check if pod was killed but container might have succeeded
|
||||
if (containerSucceeded && containerExitCode === 0) {
|
||||
@@ -5622,7 +5623,8 @@ class RemoteClient {
|
||||
}
|
||||
if (!build_parameters_1.default.shouldUseRetainedWorkspaceMode(cloud_runner_1.default.buildParameters)) {
|
||||
const uniqueJobFolderLinux = cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute);
|
||||
if (node_fs_1.default.existsSync(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute) || node_fs_1.default.existsSync(uniqueJobFolderLinux)) {
|
||||
if (node_fs_1.default.existsSync(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute) ||
|
||||
node_fs_1.default.existsSync(uniqueJobFolderLinux)) {
|
||||
await cloud_runner_system_1.CloudRunnerSystem.Run(`rm -r ${uniqueJobFolderLinux} || true`);
|
||||
}
|
||||
else {
|
||||
@@ -6324,7 +6326,7 @@ class SharedWorkspaceLocking {
|
||||
try {
|
||||
const output = await SharedWorkspaceLocking.rclone(`lsjson ${path}`);
|
||||
const json = JSON.parse(output);
|
||||
return json.map((e) => (e.IsDir ? `${e.Name}/` : e.Name));
|
||||
return json.map((entry) => (entry.IsDir ? `${entry.Name}/` : entry.Name));
|
||||
}
|
||||
catch {
|
||||
return [];
|
||||
@@ -7318,7 +7320,7 @@ git config --global filter.lfs.smudge "git-lfs smudge --skip -- %f"
|
||||
git config --global filter.lfs.process "git-lfs filter-process --skip"
|
||||
BRANCH="${cloud_runner_1.default.buildParameters.cloudRunnerBranch}"
|
||||
REPO="${cloud_runner_folders_1.CloudRunnerFolders.unityBuilderRepoUrl}"
|
||||
if [ -n "$(git ls-remote --heads \"$REPO\" \"$BRANCH\" 2>/dev/null)" ]; then
|
||||
if [ -n "$(git ls-remote --heads "$REPO" "$BRANCH" 2>/dev/null)" ]; then
|
||||
git clone -q -b "$BRANCH" "$REPO" /builder
|
||||
else
|
||||
echo "Remote branch $BRANCH not found in $REPO; falling back to a known branch"
|
||||
|
||||
Reference in New Issue
Block a user