Skip to content

Commit c4ba0ae

Browse files
committed
fix(ci): pull --rebase before push in publish workflow
The publish workflow failed because the remote main had newer commits (from a merged PR) that weren't in the CI's checkout. Adding git pull --rebase before push ensures the version-bump commit rebases on top of any changes merged during the workflow run. Also deleted the orphaned v2.0.4 tag from the failed run.
1 parent e2beb8e commit c4ba0ae

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
git add packages/use-color/package.json
6161
git commit -m "release: use-color v${{ steps.version.outputs.new_version }}"
6262
git tag "v${{ steps.version.outputs.new_version }}"
63+
git pull --rebase origin main
6364
git push origin HEAD --tags
6465
6566
# https://github.com/pnpm/pnpm/issues/3141#issuecomment-1305563972

0 commit comments

Comments
 (0)