Skip to content

Commit 7a5cd87

Browse files
committed
Update CI workflow to not prevent version bumps during automated merges from master to dev
1 parent 8b991e8 commit 7a5cd87

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ jobs:
107107

108108
check-version:
109109
# * Only on PRs into dev: prevent accidental version bumps.
110-
if: github.event_name == 'pull_request' && github.base_ref == 'dev'
110+
# This check is skipped for the automated post-release merge from master back to dev.
111+
if: github.event_name == 'pull_request' && github.base_ref == 'dev' && github.head_ref != 'master'
111112
name: Check for accidental version bump
112113
runs-on: ubuntu-latest
113114
steps:

0 commit comments

Comments
 (0)