Commit a31f42d
committed
ci: rebase before pushing release/pre-release commits
Why: Both release.yaml and pre_release.yaml push the changelog/version
bump to master via EndBug/add-and-commit. If anything else lands on
master between checkout and push, the push is rejected with `cannot
lock ref` — non-fast-forward, even when the service-account bypass
succeeds. Adding `pull: '--rebase --autostash'` lets EndBug rebase
onto the new tip first.1 parent a100c1a commit a31f42d
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