From bc87579d777ed367e7c3e5b2ada6e5cab8f60c1a Mon Sep 17 00:00:00 2001 From: Meliox <5264368+Meliox@users.noreply.github.com> Date: Mon, 17 Aug 2026 20:47:42 +0200 Subject: [PATCH] fix(ci): stop force-pushing empty diff on version-bump branch to prevent PR churn (#303) Co-authored-by: Meliox --- .github/workflows/prepare-release-pr.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/prepare-release-pr.yml b/.github/workflows/prepare-release-pr.yml index 90469c5..a206e0c 100644 --- a/.github/workflows/prepare-release-pr.yml +++ b/.github/workflows/prepare-release-pr.yml @@ -58,7 +58,6 @@ jobs: if [[ "${{ github.event_name }}" == "push" ]]; then # Always recreate from main — avoids rebase conflicts after PR merge git checkout -b chore/version-bump origin/main - git push --force origin chore/version-bump else # Label change: check out the existing branch git fetch origin chore/version-bump @@ -133,8 +132,8 @@ jobs: echo "$MAIN_CHANGELOG" } > debian/changelog git add debian/changelog - git diff --cached --quiet || git commit -m "chore: update changelog to v${NEW_VERSION}" - git push --force-with-lease origin chore/version-bump + git commit -m "chore: update changelog to v${NEW_VERSION}" + git push --force origin chore/version-bump - name: Build PR body env: