From 93e2998153d3d85977e38e3da249f2c2e56d5c75 Mon Sep 17 00:00:00 2001 From: Matsu Date: Thu, 26 Mar 2026 14:02:35 +0200 Subject: [PATCH] ci: Don't error on release candidate cleanup when branch is missing (#27602) --- .github/scripts/ensure-release-candidate-branches.mjs | 5 +++-- .github/scripts/ensure-release-candidate-branches.test.mjs | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/scripts/ensure-release-candidate-branches.mjs b/.github/scripts/ensure-release-candidate-branches.mjs index 5ff9cc21bd2..9790e838766 100644 --- a/.github/scripts/ensure-release-candidate-branches.mjs +++ b/.github/scripts/ensure-release-candidate-branches.mjs @@ -7,6 +7,7 @@ import { resolveReleaseTagForTrack, sh, tagVersionInfoToReleaseCandidateBranchName, + trySh, writeGithubOutput, } from './github-helpers.mjs'; @@ -88,12 +89,12 @@ function removeBranch(branch) { console.log(`Removing remote branch ${branch} from origin...`); // Delete remote branch - sh('git', ['push', 'origin', '--delete', branch]); + trySh('git', ['push', 'origin', '--delete', branch]); // Optional local cleanup (keeps reruns tidy) if (localRefExists(`refs/heads/${branch}`)) { console.log(`Removing local branch ${branch}...`); - sh('git', ['branch', '-D', branch]); + trySh('git', ['branch', '-D', branch]); } return branch; diff --git a/.github/scripts/ensure-release-candidate-branches.test.mjs b/.github/scripts/ensure-release-candidate-branches.test.mjs index 8200c20dbd4..2a2696e4779 100644 --- a/.github/scripts/ensure-release-candidate-branches.test.mjs +++ b/.github/scripts/ensure-release-candidate-branches.test.mjs @@ -29,6 +29,7 @@ mock.module('./github-helpers.mjs', { }, writeGithubOutput: () => {}, // no-op in tests sh: () => {}, // no-op in tests + trySh: () => {}, // no-op in tests getCommitForRef: () => {}, // no-op in tests remoteBranchExists: () => {}, // no-op in tests localRefExists: () => {}, // no-op in tests