Update GitFlow_Check-pull-request-source-branch.yml

Author: Romanitho

.github/workflows/GitFlow_Check-pull-request-source-branch.yml

@@ -1,5 +1,5 @@
 # This workflow enforces GitFlow branch patterns by:
-# - Ensuring only hotfix/* branches can target main (release branches are handled automatically)
+# - Ensuring only hotfix/* or release/* branches can target main
 # - Adding labels and comments to non-compliant PRs
 # - Automatically cleaning up when PRs are updated to comply
 
@@ -31,39 +31,33 @@ jobs:
     name: Check branch pattern
     runs-on: ubuntu-latest
     steps:
-      # Step 1: Use GitHub Script for branch pattern validation (safer than shell)
+      # Step 1: Check branch pattern
       - name: Check branch pattern
         id: branch_check
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          result-encoding: string
-          script: |
-            // Get branch information from context
-            const headRef = context.payload.pull_request.head.ref;
-            const baseRef = context.payload.pull_request.base.ref;
-            const mainBranch = process.env.MAIN_BRANCH;
-            const validPattern = new RegExp(process.env.VALID_PATTERNS);
-
-            console.log(`Checking PR from '${headRef}' to '${baseRef}'`);
-
-            // Perform the validation in JavaScript instead of shell
-            if (baseRef === mainBranch) {
-              if (!validPattern.test(headRef)) {
-                console.log(`::error::❌ Invalid branch! PRs to main must come from hotfix/* or release/* branches. Please target the develop branch instead.`);
-                return 'invalid';
-              } else {
-                console.log(`::notice::✅ Branch pattern is valid: '${headRef}' → '${mainBranch}'`);
-                return 'valid';
-              }
-            } else {
-              console.log(`::notice::✅ Not targeting main branch, no pattern restrictions apply.`);
-              return 'not-main';
-            }
+        run: |
+          # Get branch information from context
+          HEAD_REF="${{ github.head_ref }}"
+          BASE_REF="${{ github.base_ref }}"
+          MAIN_BRANCH="${{ env.MAIN_BRANCH }}"
+          VALID_PATTERN="${{ env.VALID_PATTERNS }}"
+          
+          echo "Checking PR from '$HEAD_REF' to '$BASE_REF'"
+          
+          # Perform the validation
+          if [[ "$BASE_REF" == "$MAIN_BRANCH" ]]; then
+            if [[ ! "$HEAD_REF" =~ $VALID_PATTERN ]]; then
+              echo "::error::❌ Invalid branch! PRs to main must come from hotfix/* or release/* branches. Please target the develop branch instead."
+              exit 1
+            else
+              echo "::notice::✅ Branch pattern is valid: '$HEAD_REF' → '$MAIN_BRANCH'"
+            fi
+          else
+            echo "::notice::✅ Not targeting main branch, no pattern restrictions apply."
+          fi
 
       # Step 2: If the branch pattern is invalid, add a label and comment to the PR
       - name: Handle invalid branch (label + comment)
-        if: steps.branch_check.outputs.result == 'invalid'
+        if: failure()
         uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -79,7 +73,7 @@ jobs:
             const message = `❌ **${messageIdentifier}**
 
             According to our GitFlow workflow:
-            - Pull requests to the \`main\` branch are only allowed from \`hotfix/*\` branches
+            - Pull requests to the \`main\` branch are only allowed from \`hotfix/*\` or \`release/*\` branches
             - Regular feature development and other changes should target the \`develop\` branch
 
             📝 **Action required:** Please update your PR to target the \`develop\` branch instead.
@@ -126,7 +120,7 @@ jobs:
 
       # Step 3: If the branch pattern is corrected, remove label and comment
       - name: Clean up if branch is corrected
-        if: steps.branch_check.outputs.result == 'valid' || steps.branch_check.outputs.result == 'not-main'
+        if: success()
         uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}