From ce5675069646f76477fd068682b214bd837b5a12 Mon Sep 17 00:00:00 2001 From: Srikar Reddy Date: Mon, 23 Sep 2024 13:35:03 +0530 Subject: [PATCH] Fix the branch names in restrict-branch-merge.yml --- .github/workflows/restrict-branch-merge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/restrict-branch-merge.yml b/.github/workflows/restrict-branch-merge.yml index 83713ad..be96c73 100644 --- a/.github/workflows/restrict-branch-merge.yml +++ b/.github/workflows/restrict-branch-merge.yml @@ -3,7 +3,7 @@ name: "Enforce Branch Merge Rules" on: pull_request: branches: - - master + - main - release jobs: @@ -17,8 +17,8 @@ jobs: echo "Only the develop branch can be merged into the release branch." exit 1 - - name: Enforce release/hotfix -> master - if: github.ref == 'refs/heads/master' && github.head_ref != 'release' && github.head_ref != 'hotfix' + - name: Enforce release/hotfix -> main + if: github.ref == 'refs/heads/main' && github.head_ref != 'release' && github.head_ref != 'hotfix' run: | - echo "Only the release or hotfix branch can be merged into the master branch." + echo "Only the release or hotfix branch can be merged into the main branch." exit 1