fix(ci): OSV-lasfilsvakten körs i scanvolymen
masterplan-lock / check (pull_request) Successful in 11s
security / scan (pull_request) Failing after 2m1s

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-22 11:52:26 +00:00
co-authored by Claude Sonnet 5.5
parent 9694214ac0
commit 1f3325fee8
+20 -7
View File
@@ -175,15 +175,28 @@ jobs:
# osv-scanner.toml sjalv, sa den skickas explicit nar den finns. # osv-scanner.toml sjalv, sa den skickas explicit nar den finns.
- name: OSV Scanner - name: OSV Scanner
run: | run: |
if ! find /repo -maxdepth 3 \( -name 'pnpm-lock.yaml' -o -name 'package-lock.json' \ # Lasfilsvakten MASTE koras i scanvolymen: /repo finns inte i jobbcontainern.
-o -name 'yarn.lock' -o -name 'poetry.lock' -o -name 'Pipfile.lock' \ set +e
-o -name 'requirements.txt' -o -name 'go.sum' -o -name 'Cargo.lock' \ lock=$(docker run --rm -v "$SCAN_VOLUME:/repo:ro" alpine:3.20 \
-o -name 'composer.lock' -o -name 'Gemfile.lock' \) -print -quit | grep -q .; then find /repo -path /repo/.git -prune -o -type f \( \
echo "Inga lasfiler i repot - OSV-Scanner har inget att scanna." -name 'pnpm-lock.yaml' -o -name 'package-lock.json' -o -name 'yarn.lock' \
exit 0 -o -name 'bun.lock' -o -name 'poetry.lock' -o -name 'Pipfile.lock' \
-o -name 'uv.lock' -o -name 'pdm.lock' -o -name '*requirements*.txt' \
-o -name 'go.mod' -o -name 'Cargo.lock' -o -name 'composer.lock' \
-o -name 'Gemfile.lock' \) -print -quit)
frc=$?
set -e
if [ $frc -ne 0 ]; then
echo "::error::lasfilsvakten kunde inte koras i scanvolymen (rc=$frc) - scannerfel, grinden far inte bli tyst gron"; exit 1
elif [ -z "$lock" ]; then
echo "Inga lasfiler i repot - OSV-Scanner har inget att scanna."; exit 0
else
echo "Lasfil i scanvolymen ${lock#/repo/} - OSV-Scanner kors"
fi fi
cfg="" cfg=""
if [ -f "/repo/osv-scanner.toml" ]; then cfg="--config=/repo/osv-scanner.toml"; fi if docker run --rm -v "$SCAN_VOLUME:/repo:ro" alpine:3.20 test -f /repo/osv-scanner.toml; then
cfg="--config=/repo/osv-scanner.toml"; echo "Anvander /repo/osv-scanner.toml for hela repot"
fi
set +e set +e
docker run --rm --cpus 2 --memory 4g -v "$SCAN_VOLUME:/repo" -w /repo \ docker run --rm --cpus 2 --memory 4g -v "$SCAN_VOLUME:/repo" -w /repo \
ghcr.io/google/osv-scanner:v2.7.1 scan source --recursive $cfg /repo > /tmp/scan.log 2>&1 ghcr.io/google/osv-scanner:v2.7.1 scan source --recursive $cfg /repo > /tmp/scan.log 2>&1