This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5405-main
in repository https://gitbox.apache.org/repos/asf/struts.git
commit ac270a8ab9b5a80cad672970b8722ee4bb1f7375
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sat Nov 30 09:37:27 2024 +0100
WW-5405 Prepares to rename master branch into main
---
.asf.yaml | 16 ++++++++++++++++
.github/workflows/codeql.yml | 5 +++--
.github/workflows/maven.yml | 5 +++--
.github/workflows/scorecards-analysis.yaml | 3 ++-
.github/workflows/sonar.yml | 6 +++---
Jenkinsfile | 9 ++++-----
6 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 5e259c710..b2778fa2b 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -21,6 +21,22 @@ 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
+ main:
+ # contexts are the names of checks that must pass.
+ contexts:
+ - build
+ 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/*:
+ # contexts are the names of checks that must pass.
+ contexts:
+ - build
+ 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
autolink_jira:
- WW
dependabot_alerts: true
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 23c804ec7..5dd7ebc8f 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -18,8 +18,9 @@ name: "CodeQL"
on:
push:
branches:
- - master
- - release/struts-7-0-x
+ - 'master'
+ - 'main'
+ - 'release/*'
pull_request:
permissions:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1e03eb8c7..5f4493f99 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -19,8 +19,9 @@ on:
pull_request:
push:
branches:
- - master
- - release/struts-7-0-x
+ - 'master'
+ - 'main'
+ - 'release/*'
permissions: read-all
diff --git a/.github/workflows/scorecards-analysis.yaml
b/.github/workflows/scorecards-analysis.yaml
index 2480a7f39..0c4ba6ca6 100644
--- a/.github/workflows/scorecards-analysis.yaml
+++ b/.github/workflows/scorecards-analysis.yaml
@@ -21,7 +21,8 @@ on:
- cron: "30 1 * * 6" # Weekly on Saturdays
push:
branches:
- - master
+ - "master"
+ - "main"
permissions: read-all
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index d04c72d10..f549e6297 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -19,8 +19,8 @@ on:
pull_request:
push:
branches:
- - master
- - release/struts-7-0-x
+ - 'master'
+ - 'main'
permissions: read-all
@@ -45,5 +45,5 @@ jobs:
- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
- if: ${{ github.ref == 'master' || github.base_ref == 'master' }}
+ if: ${{ github.ref == 'master' || github.base_ref == 'master' ||
github.ref == 'main' || github.base_ref == 'main' }}
run: ./mvnw -B verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-Dsonar.branch.name=master -Pcoverage -DskipAssembly
diff --git a/Jenkinsfile b/Jenkinsfile
index 45cd77441..4f98808ca 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -81,7 +81,7 @@ pipeline {
stage('Code Quality') {
when {
anyOf {
- branch 'master'; branch 'release/struts-7-0-x'
+ branch 'master'; branch 'main'
}
}
steps {
@@ -93,7 +93,7 @@ pipeline {
stage('Build Source & JavaDoc') {
when {
anyOf {
- branch 'master'; branch 'release/struts-7-0-x'
+ branch 'master'; branch 'main'
}
}
steps {
@@ -106,7 +106,7 @@ pipeline {
stage('Deploy Snapshot') {
when {
anyOf {
- branch 'master'; branch 'release/struts-7-0-x'
+ branch 'master'; branch 'main'
}
}
steps {
@@ -118,8 +118,7 @@ pipeline {
stage('Upload nightlies') {
when {
anyOf {
- branch 'master'
- branch 'release/struts-7-0-x'
+ branch 'master'; branch 'main'
}
}
steps {
