mirror of
https://github.com/apache/struts.git
synced 2026-08-05 22:56:59 +00:00
WW-5405 Updates to use the main branch instead of master
This commit is contained in:
@@ -18,8 +18,8 @@ name: "CodeQL"
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- release/struts-7-0-x
|
||||
- 'main'
|
||||
- 'release/*'
|
||||
pull_request:
|
||||
|
||||
permissions:
|
||||
|
||||
@@ -19,8 +19,8 @@ on:
|
||||
pull_request:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- release/struts-7-0-x
|
||||
- 'main'
|
||||
- 'release/*'
|
||||
|
||||
permissions: read-all
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ on:
|
||||
- cron: "30 1 * * 6" # Weekly on Saturdays
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- "main"
|
||||
|
||||
permissions: read-all
|
||||
|
||||
|
||||
@@ -19,8 +19,7 @@ on:
|
||||
pull_request:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- release/struts-7-0-x
|
||||
- 'main'
|
||||
|
||||
permissions: read-all
|
||||
|
||||
@@ -45,5 +44,6 @@ jobs:
|
||||
- env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
|
||||
if: ${{ github.ref == 'master' || github.base_ref == 'master' }}
|
||||
run: ./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.branch.name=master -Pcoverage -DskipAssembly
|
||||
MAIN_BRANCH: ${{ github.ref || github.base_ref || github.ref || github.base_ref }}
|
||||
if: ${{ github.ref == 'main' || github.base_ref == 'main' }}
|
||||
run: ./mvnw -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.branch.name=${{ envs.MAIN_BRANCH }} -Pcoverage -DskipAssembly
|
||||
|
||||
Reference in New Issue
Block a user