Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ name: "CodeQL"
on:
push:
branches:
- 'support/struts-6-x-x'
- 'release/*'
pull_request:

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ on:
pull_request:
push:
branches:
- master
- 'support/struts-6-x-x'
- 'release/*'

permissions: read-all

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/scorecards-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ on:
pull_request:
push:
branches:
- release/6-8-x
- 'support/struts-6-x-x'
- 'release/*'

permissions: read-all

Expand Down
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ pipeline {
stage('Code Quality') {
when {
anyOf {
branch 'release/struts-6-7-x'
branch 'support/struts-6-x-x'
}
}
steps {
Expand Down Expand Up @@ -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/") {
Expand All @@ -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')]) {
Expand All @@ -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'
Expand Down
Loading