Skip to content

Commit 98a02b6

Browse files
authored
chore: Update CI/CD workflows for v2 (#230)
1 parent cd48c86 commit 98a02b6

4 files changed

Lines changed: 11 additions & 10 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ name: auth0/auth0-java-mvc-common/build-and-test
22

33
on:
44
pull_request:
5+
branches: ["master", "v2"]
56
merge_group:
67
push:
7-
branches: ["master", "v1", "v2"]
8+
branches: ["master"]
89

910
jobs:
1011
gradle:
@@ -14,7 +15,7 @@ jobs:
1415
- uses: actions/setup-java@v5
1516
with:
1617
distribution: temurin
17-
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
18+
java-version: 17
1819

1920
- name: Set up Gradle
2021
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches: [ "master", "v1", "v2"]
5+
branches: [ "master" ]
66
pull_request:
7-
branches: [ "master", "v1" ]
7+
branches: [ "master", "v2" ]
88
schedule:
99
- cron: "30 19 * * 6"
1010

@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/setup-java@v5
3030
with:
3131
distribution: temurin
32-
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
32+
java-version: 17
3333

3434
- name: Initialize CodeQL
3535
uses: github/codeql-action/init@v4

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
rl-scanner:
1919
uses: ./.github/workflows/rl-secure.yml
2020
with:
21-
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
21+
java-version: 17
2222
artifact-name: "auth0-java-mvc-common.tgz"
2323
secrets:
2424
RLSECURE_LICENSE: ${{ secrets.RLSECURE_LICENSE }}
@@ -32,7 +32,7 @@ jobs:
3232
uses: ./.github/workflows/java-release.yml
3333
needs: rl-scanner
3434
with:
35-
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
35+
java-version: 17
3636
secrets:
3737
ossr-username: ${{ secrets.OSSR_USERNAME }}
3838
ossr-token: ${{ secrets.OSSR_TOKEN }}

.github/workflows/sca_scan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: SCA
22

33
on:
44
push:
5-
branches: ["master", "v1", "v2"]
5+
branches: ["master"]
66
pull_request:
7-
branches: ["master", "v1", "v2"]
7+
branches: ["master", "v2"]
88

99
jobs:
1010
snyk-cli:
1111
uses: auth0/devsecops-tooling/.github/workflows/sca-scan.yml@main
1212
with:
1313
additional-arguments: "--exclude=README.md"
14-
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
14+
java-version: "17"
1515
secrets: inherit

0 commit comments

Comments
 (0)