upd: branch name validation

Crocoblock · May 20, 2024 · 25bd897 · 25bd897
1 parent c2f7c90
commit 25bd897
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/branch.name.validation.yml b/.github/workflows/branch.name.validation.yml
@@ -19,7 +19,7 @@ jobs:
                     ref="${GITHUB_REF}"
                     if [[ "$ref" =~ ^refs/heads/ ]]; then
                         branch_name="${ref#refs/heads/}"
-                        if ! [[ "$branch_name" =~ ^(main|(release/[0-9]+\.[0-9]+\.[0-9]+)|(issue/[0-9]+)|(suggestion/[0-9]+)|(feature/[a-z0-9\-]+)|(dev/[a-z0-9\-]+))$ ]]; then
+                        if ! [[ "$branch_name" =~ ^(main|(release/[0-9\.]+)|(issue/[0-9]+)|(suggestion/[0-9]+)|(feature/[a-z0-9\-]+)|(dev/[a-z0-9\-]+))$ ]]; then
                             echo "Invalid branch name: $branch_name"
                             echo "Allowed patterns: main, release/x.y.z, issue/123, suggestion/123, feature/feature-name, dev/branch-name"
                             exit 1

diff --git a/.husky/pre-push b/.husky/pre-push
@@ -6,7 +6,7 @@ while read local_ref local_sha remote_ref remote_sha; do
     branch_name=$(echo "$local_ref" | sed 's|refs/heads/||')
 
     # Regex pattern for allowed branch names
-    allowed_pattern="^(main|(release/[0-9]+\.[0-9]+\.[0-9]+)|(issue/[0-9]+)|(suggestion/[0-9]+)|(feature/[a-z0-9\-]+)|(dev/[a-z0-9\-]+))$"
+    allowed_pattern="^(main|(release/[0-9\.]+)|(issue/[0-9]+)|(suggestion/[0-9]+)|(feature/[a-z0-9\-]+)|(dev/[a-z0-9\-]+))$"
 
     # Check if the branch name matches the allowed pattern
     if ! [[ "$branch_name" =~ $allowed_pattern ]]; then