Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/protect-master.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Master Branch Protection
name: Release Branch Protection

on:
pull_request:
Expand All @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check branch
if: github.event.pull_request.base.ref == 'master'
if: github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main'
run: |
echo "Error: Pull request against master is prohibited"
echo "Error: Submit pull requests to develop instead of the release branch"
exit 1
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Generic packages extracted from bosh-agent and bosh-init
# Dev Testing
Make changes to develop and push.

The CI pipeline [here](https://ci.bosh-ecosystem.cf-app.com/teams/main/pipelines/bosh-utils) will promote to master once the tests pass. Note the pipeline is not publicly accessible.
CI promotes tested commits from `develop` to `main`.
2 changes: 1 addition & 1 deletion ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ resources:
type: git
source:
uri: https://github.com/cloudfoundry/bosh-utils.git
branch: master
branch: main
username: bosh-admin-bot
password: ((github_public_repo_token))

Expand Down
Loading