From fe1560350223b81adbf2e3fb58943817e3490926 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 15 Nov 2025 07:32:18 -0800 Subject: [PATCH] Allow re-running prepare release branch workflow This change removes the check that prevents re-running the prepare release branch workflow when the release branch already exists. Instead, it adds fetch-depth: 0 to get full history, which allows the workflow to fast-forward push the release branch when re-running after merging additional PRs to main. --- .github/workflows/prepare-release-branch.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/prepare-release-branch.yml b/.github/workflows/prepare-release-branch.yml index 9ee4f53..9b8f77a 100644 --- a/.github/workflows/prepare-release-branch.yml +++ b/.github/workflows/prepare-release-branch.yml @@ -31,17 +31,16 @@ jobs: - prereqs steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + with: + # history is needed to allow fast-forward push below in case + # re-running this workflow after merging additional PRs to main + fetch-depth: 0 - name: Create release branch run: | version=$(.github/scripts/get-version.sh) if [[ $version =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then release_branch_name="release/v${version}" - release_branch_exists=$(git ls-remote --heads origin refs/heads/$release_branch_name) - if [[ $release_branch_exists != "" ]] ; then - echo "release branch $release_branch_name already exists" - exit 1 - fi else echo "unexpected version: $version" exit 1