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
17 changes: 17 additions & 0 deletions .github/workflows/protect-default-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Default Branch Protection

on:
pull_request:
types: [opened, reopened, synchronize, edited]
Comment thread
aramprice marked this conversation as resolved.
Resolved

permissions: {}

jobs:
check-branch:
runs-on: ubuntu-latest
steps:
- name: Check branch
if: github.event.pull_request.base.ref == github.event.repository.default_branch
run: |
echo "Error: Pull request against the default branch is prohibited; target develop"
exit 1
17 changes: 0 additions & 17 deletions .github/workflows/protect-master.yml

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# bosh-deployment

This repository is intended to serve as a reference and starting point for developer-friendly configuration of the Bosh Director. Consume the `master` branch. Any changes should be made against the `develop` branch (it will be automatically promoted once it passes tests).
This repository is intended to serve as a reference and starting point for developer-friendly configuration of the Bosh Director. Consume the `main` branch. Any changes should be made against the `develop` branch (it will be automatically promoted once it passes tests).
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

## Important notice for users of bosh-deployment and Bosh DNS versions older than 1.28

Expand All @@ -26,7 +26,7 @@ An automatic process updates Bosh, and other releases within bosh-deployment
1. A new release of [bosh](https://github.com/cloudfoundry/bosh) is created.
1. A CI pipeline updates bosh-deployment on `develop` with a compiled bosh release.
1. Smoke tests are performed to ensure `create-env` works with this potential collection of resources and the new release.
1. A commit to `master` is made.
1. A commit to `main` is made.

Other releases such as [UAA](https://github.com/cloudfoundry/uaa-release), [CredHub](https://github.com/pivotal-cf/credhub-release), and various CPIs are also updated automatically.

Expand Down
2 changes: 1 addition & 1 deletion ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1594,7 +1594,7 @@ resources:
type: git
source:
uri: git@github.com:cloudfoundry/bosh-deployment.git
branch: master
branch: main
private_key: ((github_deploy_key_bosh-deployment.private_key))

# stemcells
Expand Down
Loading