Skip to content

Commit 8c0a6ff

Browse files
jongioCopilot
andcommitted
fix(ci): add rebase before push in release workflow
The "Generate contributor notes" step pushes CONTRIBUTORS.md to main without pulling first. When two releases run concurrently, the second push fails with non-fast-forward. Add git pull --rebase before push to handle the race. Co-authored-by: Copilot <[email protected]>
1 parent 4d3c1f2 commit 8c0a6ff

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ jobs:
101101
if ! git diff --quiet CONTRIBUTORS.md; then
102102
git add CONTRIBUTORS.md
103103
git commit -m "docs: update CONTRIBUTORS.md for $NEW_TAG"
104+
git pull --rebase origin main
104105
git push origin HEAD:main
105106
fi
106107

0 commit comments

Comments
 (0)