Skip to content

Commit bdb8e5a

Browse files
Fix vulnerability scan of release version (#504)
The Gradle version use in v2.5.7 and earlier does not support Java 25. Generation of Gradle lockfile (used as input to the vulnerability scan) has just started actively failing with Java 25. This change uses Java 21 for vulnerability scanning, which is supported by Gradle 8.5 and later. Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
1 parent 481276c commit bdb8e5a

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

.github/workflows/scan.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,19 @@ jobs:
1616
osv-scanner:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
19+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2020
with:
2121
ref: ${{ inputs.ref }}
2222
# Go needed for scanning of v2.5.5 and earlier
23-
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
23+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
2424
with:
2525
go-version: stable
2626
cache: false
27-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
27+
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
2828
with:
2929
distribution: temurin
30-
java-version: 25
30+
# Releases v2.5.7 and earlier do not support Java 25
31+
java-version: 21
3132
- uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3233
- name: Scan
3334
run: make scan

.github/workflows/scheduled-scan.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
contents: read
1010

1111
jobs:
12-
latest-release-version:
12+
release-version:
1313
name: Get latest release tag
1414
runs-on: ubuntu-latest
1515
outputs:
@@ -18,9 +18,13 @@ jobs:
1818
- id: tag-name
1919
run: echo "value=$(curl --location --silent --fail "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/latest" | jq --raw-output '.tag_name')" >> "${GITHUB_OUTPUT}"
2020

21-
scan:
22-
name: Scan ${{ needs.latest-release-version.outputs.tag_name }}
23-
needs: latest-release-version
21+
scan-release:
22+
name: Scan ${{ needs.release-version.outputs.tag_name }}
23+
needs: release-version
2424
uses: ./.github/workflows/scan.yml
2525
with:
26-
ref: ${{ needs.latest-release-version.outputs.tag_name }}
26+
ref: ${{ needs.release-version.outputs.tag_name }}
27+
28+
scan-latest:
29+
name: Scan latest
30+
uses: ./.github/workflows/scan.yml

0 commit comments

Comments
 (0)