From 9ee46f076abfd286b527b9c8fd6b3c783c44d1dd Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Fri, 10 Apr 2026 06:54:09 +0200
Subject: [PATCH] ci(struts6): adjust workflows to use the new branch names

---
 .asf.yaml                                  | 13 +++++++++++--
 .github/workflows/codeql.yml               |  1 +
 .github/workflows/maven.yml                |  3 ++-
 .github/workflows/scorecards-analysis.yaml |  4 +++-
 .github/workflows/sonar.yml                |  3 ++-
 Jenkinsfile                                |  8 ++++----
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index f49aa6ff46..8bafbffaac 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -24,11 +24,20 @@ github:
         # it does not work because our github teams are private/secret, see INFRA-25666
         require_code_owner_reviews: false
         required_approving_review_count: 0
-    release/*:
+    support/struts-6-x-x:
       # contexts are the names of checks that must pass.
       required_status_checks:
         contexts:
-          - "Build and Test (JDK 8)"
+          - "Build and Test (8)"
+      required_pull_request_reviews:
+        # it does not work because our github teams are private/secret, see INFRA-25666
+        require_code_owner_reviews: false
+        required_approving_review_count: 0
+    release/struts-6-*:
+      # contexts are the names of checks that must pass.
+      required_status_checks:
+        contexts:
+          - "Build and Test (8)"
       required_pull_request_reviews:
         # it does not work because our github teams are private/secret, see INFRA-25666
         require_code_owner_reviews: false
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c5a78f535d..07f8c40dcf 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -18,6 +18,7 @@ name: "CodeQL"
 on:
   push:
     branches:
+      - 'support/struts-6-x-x'
       - 'release/*'
   pull_request:
 
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 88e0e9d64e..c5ec2c8b3f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -19,7 +19,8 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - 'support/struts-6-x-x'
+      - 'release/*'
 
 permissions: read-all
 
diff --git a/.github/workflows/scorecards-analysis.yaml b/.github/workflows/scorecards-analysis.yaml
index f7300a0a7f..6de12de8e1 100644
--- a/.github/workflows/scorecards-analysis.yaml
+++ b/.github/workflows/scorecards-analysis.yaml
@@ -20,7 +20,9 @@ on:
   schedule:
     - cron: "30 1 * * 6"    # Weekly on Saturdays
   push:
-    branches: [ "master" ]
+    branches:
+      - 'support/struts-6-x-x'
+      - 'release/*'
 
 permissions: read-all
 
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index d512341713..d843d7a655 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -19,7 +19,8 @@ on:
   pull_request:
   push:
     branches:
-      - release/6-8-x
+      - 'support/struts-6-x-x'
+      - 'release/*'
 
 permissions: read-all
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 0e27dd3e73..fa8b3274d3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -99,7 +99,7 @@ pipeline {
         stage('Code Quality') {
           when {
             anyOf {
-              branch 'release/struts-6-7-x'
+              branch 'support/struts-6-x-x'
             }
           }
           steps {
@@ -145,7 +145,7 @@ pipeline {
         }
         stage('Build Source & JavaDoc') {
           when {
-            branch 'release/struts-6-8-x'
+            branch 'support/struts-x-x-x'
           }
           steps {
             dir("local-snapshots-dir/") {
@@ -156,7 +156,7 @@ pipeline {
         }
         stage('Deploy Snapshot') {
           when {
-            branch 'release/struts-6-8-x'
+            branch 'support/struts-6-x-x'
           }
           steps {
             withCredentials([file(credentialsId: 'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
@@ -166,7 +166,7 @@ pipeline {
         }
         stage('Upload nightlies') {
           when {
-            branch 'release/struts-6-8-x'
+            branch 'support/struts-6-x-x'
           }
           steps {
             sh './mvnw -B package -DskipTests'