Skip to content

Commit 0e22570

Browse files
authored
ci(struts6): adjust workflows to use the new branch names (#1658)
1 parent 94e3ffd commit 0e22570

6 files changed

Lines changed: 23 additions & 9 deletions

File tree

.asf.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,20 @@ github:
2424
# it does not work because our github teams are private/secret, see INFRA-25666
2525
require_code_owner_reviews: false
2626
required_approving_review_count: 0
27-
release/*:
27+
support/struts-6-x-x:
2828
# contexts are the names of checks that must pass.
2929
required_status_checks:
3030
contexts:
31-
- "Build and Test (JDK 8)"
31+
- "Build and Test (8)"
32+
required_pull_request_reviews:
33+
# it does not work because our github teams are private/secret, see INFRA-25666
34+
require_code_owner_reviews: false
35+
required_approving_review_count: 0
36+
release/struts-6-*:
37+
# contexts are the names of checks that must pass.
38+
required_status_checks:
39+
contexts:
40+
- "Build and Test (8)"
3241
required_pull_request_reviews:
3342
# it does not work because our github teams are private/secret, see INFRA-25666
3443
require_code_owner_reviews: false

.github/workflows/codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ name: "CodeQL"
1818
on:
1919
push:
2020
branches:
21+
- 'support/struts-6-x-x'
2122
- 'release/*'
2223
pull_request:
2324

.github/workflows/maven.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ on:
1919
pull_request:
2020
push:
2121
branches:
22-
- master
22+
- 'support/struts-6-x-x'
23+
- 'release/*'
2324

2425
permissions: read-all
2526

.github/workflows/scorecards-analysis.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ on:
2020
schedule:
2121
- cron: "30 1 * * 6" # Weekly on Saturdays
2222
push:
23-
branches: [ "master" ]
23+
branches:
24+
- 'support/struts-6-x-x'
25+
- 'release/*'
2426

2527
permissions: read-all
2628

.github/workflows/sonar.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ on:
1919
pull_request:
2020
push:
2121
branches:
22-
- release/6-8-x
22+
- 'support/struts-6-x-x'
23+
- 'release/*'
2324

2425
permissions: read-all
2526

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ pipeline {
9999
stage('Code Quality') {
100100
when {
101101
anyOf {
102-
branch 'release/struts-6-7-x'
102+
branch 'support/struts-6-x-x'
103103
}
104104
}
105105
steps {
@@ -145,7 +145,7 @@ pipeline {
145145
}
146146
stage('Build Source & JavaDoc') {
147147
when {
148-
branch 'release/struts-6-8-x'
148+
branch 'support/struts-x-x-x'
149149
}
150150
steps {
151151
dir("local-snapshots-dir/") {
@@ -156,7 +156,7 @@ pipeline {
156156
}
157157
stage('Deploy Snapshot') {
158158
when {
159-
branch 'release/struts-6-8-x'
159+
branch 'support/struts-6-x-x'
160160
}
161161
steps {
162162
withCredentials([file(credentialsId: 'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
@@ -166,7 +166,7 @@ pipeline {
166166
}
167167
stage('Upload nightlies') {
168168
when {
169-
branch 'release/struts-6-8-x'
169+
branch 'support/struts-6-x-x'
170170
}
171171
steps {
172172
sh './mvnw -B package -DskipTests'

0 commit comments

Comments
 (0)