From 6c70176d6eafc0f81e023ea7b76d984b3c9720d6 Mon Sep 17 00:00:00 2001
From: Martin Polasko <mpolasko@redhat.com>
Date: Tue, 14 Jul 2026 14:29:55 +0200
Subject: [PATCH] chore: generalize release-1.* branch patterns for 2.y support

GitHub Actions branch filters hardcoded release-1.[0-9]+ / rhdh-1.[0-9]+ /
1.[0-9]+.x, which would silently stop matching once release branches move
to release-2.0 and beyond. Generalize these to digit-agnostic patterns
(release-[0-9]+.[0-9]+, etc.) so CI keeps working across the 1.y -> 2.y
transition with no further changes needed.

Part of the upstream build-infrastructure audit for 2.y readiness.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .github/workflows/lint.yaml       | 6 +++---
 .github/workflows/pre-commit.yaml | 2 +-
 .github/workflows/release.yaml    | 2 +-
 .github/workflows/test.yaml       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index b83cdb3b..a0cbf3c9 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -4,9 +4,9 @@ on:
   pull_request:
     branches:
       - main
-      - rhdh-1.[0-9]+
-      - 1.[0-9]+.x
-      - release-1.[0-9]+
+      - rhdh-[0-9]+.[0-9]+
+      - "[0-9]+.[0-9]+.x"
+      - release-[0-9]+.[0-9]+
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number }}
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
index f60e298d..ee2f123a 100644
--- a/.github/workflows/pre-commit.yaml
+++ b/.github/workflows/pre-commit.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - main
-      - release-1.[0-9]+
+      - release-[0-9]+.[0-9]+
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index fdb2e5a6..2b3d3b59 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - release-1.[0-9]+
+      - release-[0-9]+.[0-9]+
     paths:
       - "charts/**"
 
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index c6b3a3f9..c7b3eb79 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - main
-      - release-1.[0-9]+
+      - release-[0-9]+.[0-9]+
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number }}