Skip to content

Commit a31f42d

Browse files
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

File tree

.github/workflows/pre_release.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ jobs:
9292
author_name: Apify Release Bot
9393
author_email: noreply@apify.com
9494
message: "chore(release): Update changelog and package version [skip ci]"
95+
pull: '--rebase --autostash'
9596

9697
- name: Get pre-release version
9798
id: get-pre-release-version

.github/workflows/release.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ jobs:
125125
author_name: Apify Release Bot
126126
author_email: noreply@apify.com
127127
message: "chore(release): Update changelog and package version [skip ci]"
128+
pull: '--rebase --autostash'
128129

129130
build-bundles:
130131
name: Build bundles

0 commit comments

Comments
 (0)