Skip to content

Commit aa012b8

Browse files
authored
Amend latest commit instead of creating a new one for version bump (#723)
Amend latest commit instead of creating a new one The version's patch number equals the commit count. Creating a new commit changes that count, causing invoke setver to find another version bump on the next CD run — an infinite loop. Amending the triggering commit keeps the count unchanged, so the subsequent CD run finds no version change and stops. Uses --amend -C HEAD to preserve the original commit author (bot becomes committer only) and --force-with-lease to prevent overwriting any concurrent push that landed since checkout.
1 parent dfc6636 commit aa012b8

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/cd_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ jobs:
7171
if: steps.update_version_step.outputs.continue_workflow == 'true'
7272
run: |
7373
git add app/__init__.py CHANGELOG.md
74-
git commit -m "[bot] Update version and CHANGELOG"
74+
git commit --amend -C HEAD
7575
7676
- name: Update '${{ env.DEFAULT_REPO_BRANCH }}'
7777
if: steps.update_version_step.outputs.continue_workflow == 'true'
78-
run: git push origin ${{ env.DEFAULT_REPO_BRANCH }}
78+
run: git push --force-with-lease origin ${{ env.DEFAULT_REPO_BRANCH }}
7979

8080
publish_container_image:
8181
name: Publish Container image on GH Packages

0 commit comments

Comments
 (0)