Commit 66abc66
authored
ci: rebase before pushing release/pre-release commits (#1109)
## Summary
Add `pull: '--rebase --autostash'` to the `EndBug/add-and-commit` step
in the `update_changelog` jobs of both `release.yaml` and
`pre_release.yaml`, so the changelog/version commits survive a
concurrent ref update on master.
## Context
Same race that bit `apify/apify-client-js` in [run
25114327598](https://github.com/apify/apify-client-js/actions/runs/25114327598/job/73597522121):
```
remote rejected (cannot lock ref 'refs/heads/master': is at <new> but expected <old>)
```
The bypass logs `remote: Bypassed rule violations for refs/heads/master`
— so it's not permissions, it's just non-fast-forward because something
landed on master between checkout and push. `pre_release.yaml` is
especially exposed since it's triggered on every push to master.
🤖 Generated with [Claude Code](https://claude.com/claude-code)1 parent a100c1a commit 66abc66
2 files changed
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
| 95 | + | |
95 | 96 | | |
96 | 97 | | |
97 | 98 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
125 | 125 | | |
126 | 126 | | |
127 | 127 | | |
| 128 | + | |
128 | 129 | | |
129 | 130 | | |
130 | 131 | | |
| |||
0 commit comments