From 51f50430f9514c40edc6c4dbbd6da3cf6066b20c Mon Sep 17 00:00:00 2001 From: aram price Date: Mon, 2 Nov 2026 16:37:29 -0800 Subject: [PATCH] Promote tested utility commits to main Keep develop as the contribution branch and promote tested commits to main. Extend the PR guard to cover the renamed release branch. --- .github/workflows/protect-master.yml | 6 +++--- README.md | 2 +- ci/pipeline.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/protect-master.yml b/.github/workflows/protect-master.yml index 8394cfc4..0c40dc37 100644 --- a/.github/workflows/protect-master.yml +++ b/.github/workflows/protect-master.yml @@ -1,4 +1,4 @@ -name: Master Branch Protection +name: Release Branch Protection on: pull_request: @@ -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 \ No newline at end of file diff --git a/README.md b/README.md index 04f92de2..b60f61cb 100644 --- a/README.md +++ b/README.md @@ -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`. diff --git a/ci/pipeline.yml b/ci/pipeline.yml index ef2add58..541b57b1 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -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))