This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch support/struts-6-x-x
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/support/struts-6-x-x by this
push:
new 0e2257076 ci(struts6): adjust workflows to use the new branch names
(#1658)
0e2257076 is described below
commit 0e22570763d9d161f71ed0c6d373c173d897460f
Author: Lukasz Lenart <[email protected]>
AuthorDate: Fri Apr 10 08:23:04 2026 +0200
ci(struts6): adjust workflows to use the new branch names (#1658)
---
.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 f49aa6ff4..8bafbffaa 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 c5a78f535..07f8c40dc 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 88e0e9d64..c5ec2c8b3 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 f7300a0a7..6de12de8e 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 d51234171..d843d7a65 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 0e27dd3e7..fa8b3274d 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'
