From ef1a9809ffaa0be861e3b7808031a6c43b6a6bef Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 15:24:12 -0400 Subject: [PATCH] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index b9108c46..a9ca87c9 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -120,11 +120,18 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git add "$GRADLE_FILE" "$CHANGELOG" "fdroid/metadata/${new_code}.txt" git commit -m "chore: bump to $new_name ($new_code)" - + - name: Push bump branch run: | - git checkout -b bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }} - git push --set-upstream origin bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }} + branch="bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }}" + # Create or switch to the branch locally + if git rev-parse --verify "$branch" >/dev/null 2>&1; then + git checkout "$branch" + else + git checkout -b "$branch" + fi + # Force-push safely: only if the remote hasn't moved since last fetched + git push --force-with-lease origin HEAD:"$branch" - name: Open PR (no auto-merge) uses: peter-evans/create-pull-request@v5