Skip to content

Commit a38c8e8

Browse files
tanya732tanya732
authored
Merge branch 'master' into leeway-overflow
2 parents 07635e1 + dba4c93 commit a38c8e8

15 files changed

Lines changed: 84 additions & 87 deletions

‎.github/actions/maven-publish/action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717

1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121

2222
- name: Setup Java
2323
shell: bash
@@ -33,9 +33,9 @@ runs:
3333
env:
3434
JAVA_HOME: ${{ env.JAVA_HOME }}
3535

36-
- name: Publish Android/Java Packages to Maven
36+
- name: Publish Java Packages to Maven
3737
shell: bash
38-
run: ./gradlew publish -PisSnapshot=false --stacktrace
38+
run: ./gradlew publishToSonatype closeSonatypeStagingRepository -PisSnapshot=false --stacktrace
3939
env:
4040
JAVA_HOME: ${{ env.JAVA_HOME }}
4141
MAVEN_USERNAME: ${{ inputs.ossr-username }}

.github/workflows/dependabot.yml renamed to .github/dependabot.yml

File renamed without changes.

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,22 @@ jobs:
1010
gradle:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
14-
- uses: actions/setup-java@v3
13+
- uses: actions/checkout@v6
14+
- uses: actions/setup-java@v5
1515
with:
1616
distribution: temurin
1717
java-version: 11
18-
- uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c
19-
with:
20-
arguments: assemble apiDiff check jacocoTestReport --continue --console=plain
21-
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
18+
19+
- name: Set up Gradle
20+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
21+
22+
- name: Test and Assemble and ApiDiff with Gradle
23+
run: ./gradlew assemble apiDiff check jacocoTestReport --continue --console=plain
24+
25+
- uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de
2226
with:
2327
flags: unittests
24-
- uses: actions/upload-artifact@v3
28+
- uses: actions/upload-artifact@v7
2529
with:
2630
name: Reports
2731
path: lib/build/reports

‎.github/workflows/gradle-wrapper-validation.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ jobs:
66
name: "validation/gradlew"
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
10-
- uses: gradle/wrapper-validation-action@8d49e559aae34d3e0eb16cde532684bc9702762b # pin@v1.0.6
9+
- uses: actions/checkout@v6
10+
- uses: gradle/actions/wrapper-validation@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # pin@v6.1.0

‎.github/workflows/java-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
# Checkout the code
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v6
3333
with:
3434
fetch-depth: 0
3535

‎.github/workflows/rl-secure.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,21 @@ jobs:
3232

3333
steps:
3434
- name: Checkout code
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v6
3636
with:
3737
fetch-depth: 0
3838

3939
- name: Set up Java
40-
uses: actions/setup-java@v4
40+
uses: actions/setup-java@v5
4141
with:
4242
distribution: temurin
4343
java-version: ${{ inputs.java-version }}
4444

45-
- name: Build with Gradle
46-
uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c
47-
with:
48-
arguments: assemble apiDiff check jacocoTestReport --continue --console=plain
45+
- name: Set up Gradle
46+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
47+
48+
- name: Test and Assemble and ApiDiff with Gradle
49+
run: ./gradlew assemble apiDiff check jacocoTestReport --continue --console=plain
4950

5051
- name: Get Artifact Version
5152
id: get_version

‎.github/workflows/sca_scan.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: SCA
2+
3+
on:
4+
push:
5+
branches: ["master"]
6+
pull_request:
7+
branches: ["master"]
8+
9+
jobs:
10+
snyk-cli:
11+
uses: auth0/devsecops-tooling/.github/workflows/sca-scan.yml@main
12+
with:
13+
additional-arguments: "--exclude=README.md"
14+
java-version: "11"
15+
secrets: inherit

‎.github/workflows/semgrep.yml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +0,0 @@
1-
name: Semgrep
2-
3-
on:
4-
pull_request: {}
5-
6-
push:
7-
branches: ["master", "main"]
8-
9-
schedule:
10-
- cron: '30 0 1,15 * *'
11-
12-
jobs:
13-
semgrep:
14-
name: Scan
15-
runs-on: ubuntu-latest
16-
container:
17-
image: returntocorp/semgrep
18-
if: (github.actor != 'dependabot[bot]')
19-
steps:
20-
- uses: actions/checkout@v3
21-
22-
- run: semgrep ci
23-
env:
24-
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}

‎.github/workflows/snyk.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
- if: github.actor == 'dependabot[bot]' || github.event_name == 'merge_group'
3131
run: exit 0 # Skip unnecessary test runs for dependabot and merge queues. Artifically flag as successful, as this is a required check for branch protection.
3232

33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v6
3434
with:
3535
ref: ${{ github.event.pull_request.head.sha || github.ref }}
3636

37-
- uses: snyk/actions/gradle-jdk11@b98d498629f1c368650224d6d212bf7dfa89e4bf # pin@0.4.0
37+
- uses: snyk/actions/gradle-jdk11@9adf32b1121593767fc3c057af55b55db032dc04 # pin@1.0.0
3838
env:
3939
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

‎.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.5.0
1+
4.5.1

0 commit comments

Comments
 (0)