Skip to content

Commit cd48c86

Browse files
tanya732TareqKkailash-b
authored
chore: Update CI/CD workflows for dual-version (v1/v2) support (#227)
Co-authored-by: Tareq Kirresh <kirreshtareq@gmail.com> Co-authored-by: Kailash B <kaish95@gmail.com>
1 parent 75b664f commit cd48c86

5 files changed

Lines changed: 15 additions & 10 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
merge_group:
66
push:
7-
branches: ["master", "main", "v1"]
7+
branches: ["master", "v1", "v2"]
88

99
jobs:
1010
gradle:
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/setup-java@v5
1515
with:
1616
distribution: temurin
17-
java-version: 8
17+
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
1818

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

.github/workflows/codeql.yml

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

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

@@ -26,6 +26,11 @@ jobs:
2626
- name: Checkout
2727
uses: actions/checkout@v6
2828

29+
- uses: actions/setup-java@v5
30+
with:
31+
distribution: temurin
32+
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
33+
2934
- name: Initialize CodeQL
3035
uses: github/codeql-action/init@v4
3136
with:

.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: 8
21+
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '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: 8.0.382-tem
35+
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '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"]
5+
branches: ["master", "v1", "v2"]
66
pull_request:
7-
branches: ["master"]
7+
branches: ["master", "v1", "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: "8"
14+
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
1515
secrets: inherit

.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.12.0
1+
2.0.0-beta.0

0 commit comments

Comments
 (0)