From d908102d600f719b90af26616ec80c5d76bc041f Mon Sep 17 00:00:00 2001
From: Alexandru Dimofte <alexandru.dimofte@intel.com>
Date: Fri, 27 Mar 2026 18:47:40 +0200
Subject: [PATCH] Fix branches filtering, regex doesn't work at branches level

---
 .github/workflows/pre-merge.yml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml
index 68074207..e67a5dfd 100644
--- a/.github/workflows/pre-merge.yml
+++ b/.github/workflows/pre-merge.yml
@@ -6,7 +6,7 @@ name: Pre-Merge CI Pipeline
 
 on:  # yamllint disable-line rule:truthy
   pull_request:
-    branches: ['main', 'release-[0-9]+.[0-9]+.*']
+    branches: ['main', 'release-*']
   workflow_dispatch:
 
 concurrency:
@@ -21,17 +21,39 @@ jobs:
     permissions:
       contents: read
     runs-on: ubuntu-latest
+    outputs:
+      skip: ${{ steps.branch_check.outputs.skip }}
     steps:
       - uses: actions/checkout@v6
         with:
           persist-credentials: false
+      - name: Validate branch name
+        id: branch_check
+        run: |
+          BRANCH="${GITHUB_HEAD_REF:-${GITHUB_REF_NAME}}"
+          echo "Branch: $BRANCH"
+
+          if [[ "$BRANCH" == release-* ]]; then
+            if [[ "$BRANCH" =~ ^release-[0-9]+\.[0-9]+(\.[0-9]+)?$ ]]; then
+              echo "✅ Valid release branch"
+              echo "skip=false" >> $GITHUB_OUTPUT
+            else
+              echo "⚠️ Invalid release branch → skipping pipeline"
+              echo "skip=true" >> $GITHUB_OUTPUT
+            fi
+          else
+            echo "Not a release branch"
+            echo "skip=false" >> $GITHUB_OUTPUT
+          fi
       - name: "Verify Branch Name"
+        if: steps.branch_check.outputs.skip != 'true'
         uses: open-edge-platform/orch-ci/verify-branch-name@b5930c48c1fcdb6b34ffbcd465cff96dabfbde70  # yamllint disable-line rule:line-length
 
   pre-merge-pipeline:
     permissions:
       contents: read
     needs: pre-checks
+    if: needs.pre-checks.outputs.skip != 'true'
     uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@b5930c48c1fcdb6b34ffbcd465cff96dabfbde70  # yamllint disable-line rule:line-length
     with:
       run_security_scans: false