Skip to content

chore: Update CI/CD workflows for v2 #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tanya732 merged 1 commit into from
May 19, 2026
+11 −10
Merged

chore: Update CI/CD workflows for v2 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ name: auth0/auth0-java-mvc-common/build-and-test

on:
pull_request:
branches: ["master", "v2"]
merge_group:
push:
branches: ["master", "v1", "v2"]
branches: ["master"]

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

- name: Set up Gradle
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ "master", "v1", "v2"]
branches: [ "master" ]
pull_request:
branches: [ "master", "v1" ]
branches: [ "master", "v2" ]
schedule:
- cron: "30 19 * * 6"

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

- name: Initialize CodeQL
uses: github/codeql-action/init@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
rl-scanner:
uses: ./.github/workflows/rl-secure.yml
with:
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
java-version: 17
artifact-name: "auth0-java-mvc-common.tgz"
secrets:
RLSECURE_LICENSE: ${{ secrets.RLSECURE_LICENSE }}
Expand All @@ -32,7 +32,7 @@ jobs:
uses: ./.github/workflows/java-release.yml
needs: rl-scanner
with:
java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
java-version: 17
secrets:
ossr-username: ${{ secrets.OSSR_USERNAME }}
ossr-token: ${{ secrets.OSSR_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sca_scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ name: SCA

on:
push:
branches: ["master", "v1", "v2"]
branches: ["master"]
pull_request:
branches: ["master", "v1", "v2"]
branches: ["master", "v2"]

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