Skip to content

Commit d416a9d

Browse files
authored
fix: add git pull --rebase before push in workflows (#16)
- Add rebase step in daily-benchmark.yml before pushing changes - Add rebase step in daily-updates.yml before pushing dependency updates - Prevents potential push conflicts in automated workflows
1 parent bd204cf commit d416a9d

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

.github/workflows/daily-benchmark.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ jobs:
233233
git config --local user.name "GitHub Action"
234234
git add README.md previous-benchmark-results.json
235235
git commit -m "📊 Update benchmark results - $(date '+%Y-%m-%d') [${{ needs.analysis.outputs.tag-name }}]"
236+
git pull --rebase origin main
236237
git push
237238
238239
- name: Create or update GitHub release

.github/workflows/daily-updates.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ jobs:
114114
git config --local user.name "GitHub Action"
115115
git add -A
116116
git commit -m "⬆️ Update dependencies to latest versions - $(date '+%Y-%m-%d')" || exit 0
117+
git pull --rebase origin main
117118
git push
118119
119120
- name: Create PR for dependency updates

0 commit comments

Comments
 (0)