Skip to content

Commit bc8d3b3

Browse files
authored
CI - Update release branch check (#246)
## Description of Changes This updates the CI check protecting the release branch, as part of #226 (see that ticket for more details). Once this is merged, it will need to be cherrypicked into our release branch in order to take effect there. The check itself has also been renamed. I have already updated the branch protection rules to look for the new name. ## API No code changes. ## Requires SpacetimeDB PRs None ## Testsuite SpacetimeDB branch name: master ## Testing The previous behavior was well-tested, and I've just changed some strings here, so I have not done further testing. It does pass on this branch though. Co-authored-by: Zeke Foppa <[email protected]>
1 parent d5b255b commit bc8d3b3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.github/workflows/check-pr-base.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ permissions: read-all
88

99
jobs:
1010
check_base_ref:
11-
name: Only release branches may merge into master
11+
name: Release branch restriction
1212
runs-on: ubuntu-latest
1313
steps:
1414
- id: not_based_on_master
1515
if: |
1616
github.event_name == 'pull_request' &&
17-
github.event.pull_request.base.ref == 'master' &&
17+
github.event.pull_request.base.ref == 'release/latest' &&
1818
! startsWith(github.event.pull_request.head.ref, 'release/')
1919
run: |
20-
echo 'Only `release/*` branches are allowed to merge into `master`.'
21-
echo 'Maybe your PR should be merging into `staging`?'
20+
echo 'Only `release/*` branches are allowed to merge into the release branch `release/latest`.'
21+
echo 'Maybe you want to change your PR base to `master`?'
2222
exit 1

0 commit comments

Comments
 (0)