From bcfc1c9fa09524709c056172c44d13fd4fbf0dca Mon Sep 17 00:00:00 2001
From: aram price <aram.price@broadcom.com>
Date: Tue, 3 Nov 2026 14:43:18 -0800
Subject: [PATCH] Prepare the default branch rename to main

---
 .github/workflows/protect-default-branch.yml | 17 +++++++++++++++++
 .github/workflows/protect-master.yml         | 17 -----------------
 README.md                                    |  4 ++--
 ci/pipeline.yml                              |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 .github/workflows/protect-default-branch.yml
 delete mode 100644 .github/workflows/protect-master.yml

diff --git a/.github/workflows/protect-default-branch.yml b/.github/workflows/protect-default-branch.yml
new file mode 100644
index 00000000..addc9ce6
--- /dev/null
+++ b/.github/workflows/protect-default-branch.yml
@@ -0,0 +1,17 @@
+name: Default Branch Protection
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize, edited]
+
+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
diff --git a/.github/workflows/protect-master.yml b/.github/workflows/protect-master.yml
deleted file mode 100644
index 8394cfc4..00000000
--- a/.github/workflows/protect-master.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Master Branch Protection
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize, edited]
-
-permissions: {}
-
-jobs:
-  check-branch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check branch
-        if: github.event.pull_request.base.ref == 'master'
-        run: |
-          echo "Error: Pull request against master is prohibited"
-          exit 1
\ No newline at end of file
diff --git a/README.md b/README.md
index 230a62b2..8988c993 100644
--- a/README.md
+++ b/README.md
@@ -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).
 
 ## Important notice for users of bosh-deployment and Bosh DNS versions older than 1.28
 
@@ -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.
 
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 583e83ad..07a74c54 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -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