fix(ci): stop force-pushing empty diff on version-bump branch to prevent PR churn (#303)
Co-authored-by: Meliox <na>
This commit is contained in:
parent
e59d09a788
commit
bc87579d77
5
.github/workflows/prepare-release-pr.yml
vendored
5
.github/workflows/prepare-release-pr.yml
vendored
@ -58,7 +58,6 @@ jobs:
|
|||||||
if [[ "${{ github.event_name }}" == "push" ]]; then
|
if [[ "${{ github.event_name }}" == "push" ]]; then
|
||||||
# Always recreate from main — avoids rebase conflicts after PR merge
|
# Always recreate from main — avoids rebase conflicts after PR merge
|
||||||
git checkout -b chore/version-bump origin/main
|
git checkout -b chore/version-bump origin/main
|
||||||
git push --force origin chore/version-bump
|
|
||||||
else
|
else
|
||||||
# Label change: check out the existing branch
|
# Label change: check out the existing branch
|
||||||
git fetch origin chore/version-bump
|
git fetch origin chore/version-bump
|
||||||
@ -133,8 +132,8 @@ jobs:
|
|||||||
echo "$MAIN_CHANGELOG"
|
echo "$MAIN_CHANGELOG"
|
||||||
} > debian/changelog
|
} > debian/changelog
|
||||||
git add debian/changelog
|
git add debian/changelog
|
||||||
git diff --cached --quiet || git commit -m "chore: update changelog to v${NEW_VERSION}"
|
git commit -m "chore: update changelog to v${NEW_VERSION}"
|
||||||
git push --force-with-lease origin chore/version-bump
|
git push --force origin chore/version-bump
|
||||||
|
|
||||||
- name: Build PR body
|
- name: Build PR body
|
||||||
env:
|
env:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user