Skip to content

Fix CD release: use new commit instead of force-push to update master #719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CasperWA merged 3 commits into from
Apr 21, 2026
Merged

Fix CD release: use new commit instead of force-push to update master #719

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d07ba4c
Update push-protected action
CasperWA Apr 21, 2026
cfc7bdc
Try to fix the release workflow with an extra commit
CasperWA Apr 21, 2026
f27f18e
Add note to skip running ci to version bump commit message
CasperWA Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/cd_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,17 @@ jobs:
if: steps.update_version_step.outputs.continue_workflow == 'true'
run: |
git add app/__init__.py CHANGELOG.md
git commit --amend -C HEAD
git commit -m "[bot] Update version and CHANGELOG"
Comment thread
CasperWA marked this conversation as resolved.
Outdated

- name: Update '${{ env.DEFAULT_REPO_BRANCH }}'
if: steps.update_version_step.outputs.continue_workflow == 'true'
uses: CasperWA/push-protected@v2
with:
token: ${{ secrets.RELEASE_PAT }}
branch: ${{ env.DEFAULT_REPO_BRANCH }}
sleep: 15
force: true
unprotect_reviews: false
pre_sleep: 15
force: false
unprotect_reviews: true
Comment thread
CasperWA marked this conversation as resolved.

publish_container_image:
name: Publish Container image on GH Packages
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,3 +570,5 @@ MigrationBackup/
constraints.txt

.*_cache/

.claude/