summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuqman <luqazino@gmail.com>2024-03-14 14:54:02 +0100
committerLuqman <luqazino@gmail.com>2024-03-14 14:54:02 +0100
commit313e3bfa0ff3f1ab1edb961b82e8ee0b07fdde43 (patch)
tree5e80b72970b8fe76ef40cb139c944a12b45dde58
parentccb675ba982c9d552907cb20eaa81411862c21cb (diff)
Allow `hotfix` branch to be merged with `develop` branch
-rw-r--r--.github/workflows/branch-name-check.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/branch-name-check.yml b/.github/workflows/branch-name-check.yml
index 430e43f8d9b..3922e98170c 100644
--- a/.github/workflows/branch-name-check.yml
+++ b/.github/workflows/branch-name-check.yml
@@ -31,7 +31,7 @@ jobs:
id: check-develop-branch
if: ${{ steps.branch-names.outputs.base_ref_branch == 'develop' }}
run: |
- if ! [[ "${{ steps.branch-names.outputs.head_ref_branch }}" =~ ^(feature/.*|docs/.*|bugfix/.*|release/[0-9]+\.[0-9]+\.[0-9]+(rc[0-9]+)?)$ ]]; then
+ if ! [[ "${{ steps.branch-names.outputs.head_ref_branch }}" =~ ^(feature/.*|docs/.*|bugfix/.*|hotfix/.*|release/[0-9]+\.[0-9]+\.[0-9]+(rc[0-9]+)?)$ ]]; then
echo "reason=Invalid branch name for a Pull Request to be merged to `${{ steps.branch-names.outputs.base_ref_branch }}` branch. Branches must follow the GitFlow naming convention." >> $GITHUB_OUTPUT
fi