coder/claudechecker
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 121 Wiki Activity

Add rebase before push in both workflows to handle concurrent commits

Browse Source
This commit is contained in:
james
2026-05-07 23:30:18 +02:00
parent c3ea2be809
commit 7b03909c55
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/release-beta.yml
+1
View File
@@ -75,4 +75,5 @@ jobs:
git config user.email "github-actions[bot]@users.noreply.github.com" git config user.email "github-actions[bot]@users.noreply.github.com"
git add version-beta.json README.md git add version-beta.json README.md
git commit -m "Beta release ${{ github.ref_name }}" git commit -m "Beta release ${{ github.ref_name }}"
git pull --rebase origin main
git push origin HEAD:main git push origin HEAD:main
.github/workflows/release.yml
+1
View File
@@ -91,6 +91,7 @@ jobs:
git config user.email "github-actions[bot]@users.noreply.github.com" git config user.email "github-actions[bot]@users.noreply.github.com"
git add version.json README.md git add version.json README.md
git commit -m "Release ${{ github.ref_name }}" git commit -m "Release ${{ github.ref_name }}"
git pull --rebase origin main
git push origin HEAD:main git push origin HEAD:main
- name: Update Homebrew tap - name: Update Homebrew tap