Skip to content

Commit c0fab84

Browse files
Merge pull request #326 from Nordix/lentzi90/bump-osv-scanner
🌱 Bump OSV scanner action to fix SARIF upload issue
2 parents 22b2c33 + 037401c commit c0fab84

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/osv-scanner-scan.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
workflow_dispatch:
77
schedule:
88
- cron: "36 6 * * *"
9+
pull_request:
10+
paths:
11+
- '.github/workflows/osv-scanner-scan.yml'
912

1013
permissions: {}
1114

@@ -28,7 +31,7 @@ jobs:
2831
go-version: ${{ steps.vars.outputs.go_version }}
2932
# NOTE: this "go install" is not updated by Dependabot
3033
- name: Install OSV Scanner
31-
run: go install github.com/google/osv-scanner/v2/cmd/osv-scanner@9267fda97136812f3217852fd380104487cf4a00 # v2.1.0
34+
run: go install github.com/google/osv-scanner/v2/cmd/osv-scanner@a14aa98ab8408547083d4411091c5fbaf5b47d8e # v2.2.0
3235
- name: Run OSV Scanner
3336
id: osv-scan
3437
run: |
@@ -39,7 +42,7 @@ jobs:
3942
echo "has_vulnerabilities=$(jq '.results | length > 0' results.json)" >> "${GITHUB_OUTPUT}"
4043
continue-on-error: true
4144
- name: "Run OSV Scanner Reporter"
42-
uses: google/osv-scanner/actions/reporter@9267fda97136812f3217852fd380104487cf4a00 # v2.1.0
45+
uses: google/osv-scanner/actions/reporter@a14aa98ab8408547083d4411091c5fbaf5b47d8e # v2.2.0
4346
with:
4447
scan-args: |-
4548
--output=results.sarif

hack/verify-release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@ if [[ -n "${CONTAINER_RUNTIME}" ]]; then
139139
"${CONTAINER_RUNTIME}" run --rm
140140
-v "${PWD}":"/src:ro,z"
141141
-w /src
142-
ghcr.io/google/osv-scanner:v2.1.0@sha256:9a1ba57d2a1506c9e9d0dfbeaf46346507e829745b70d47d77e12c38e66de8d7
142+
ghcr.io/google/osv-scanner:v2.2.0@sha256:edad0349f4e50fad17d1803af2fda9a0f0d9f32ccb927b0901c93bc2dc03b53a
143143
)
144144
else
145145
# go install github.com/google/go-containerregistry/cmd/gcrane@latest
146-
# go install github.com/google/osv-scanner/v2/cmd/osv-scanner@v2.1.0
146+
# go install github.com/google/osv-scanner/v2/cmd/osv-scanner@v2.2.0
147147
required_tools+=(
148148
gcrane
149149
osv-scanner
@@ -205,7 +205,7 @@ check_tools()
205205
case "${tool}" in
206206
osv-scanner)
207207
version=$("${OSVSCANNER_CMD[@]}" -v | grep version | cut -f3 -d" ")
208-
min_version="2.1.0"
208+
min_version="2.2.0"
209209
;;
210210
*)
211211
# dummy values here for other tools

0 commit comments

Comments
 (0)