Merge pull request 'fix(ci): OSV-vakten körs i scanvolymen (OSV har aldrig körts)' (#560) from fix/osv-guard-in-scan-volume-20261111 into main
masterplan-lock / check (push) Successful in 3s
CI (SIAX Cloud) / Component conformance (blocking) (push) Successful in 21s
CI (SIAX Cloud) / security (push) Successful in 37s
security / scan (push) Failing after 37s
Release chain (G17, ADR-W16-003) / Build, push, G17 (SBOM/scan/attest/verify/evidence) (push) Successful in 1m17s
Deploy to Coolify / deploy (push) Successful in 2m11s
CI (SIAX Cloud) / sonar (push) Successful in 1m52s
CI (SIAX Cloud) / integration (push) Successful in 11m19s
CI (SIAX Cloud) / quality (push) Successful in 12m21s
masterplan-lock / check (push) Successful in 3s
CI (SIAX Cloud) / Component conformance (blocking) (push) Successful in 21s
CI (SIAX Cloud) / security (push) Successful in 37s
security / scan (push) Failing after 37s
Release chain (G17, ADR-W16-003) / Build, push, G17 (SBOM/scan/attest/verify/evidence) (push) Successful in 1m17s
Deploy to Coolify / deploy (push) Successful in 2m11s
CI (SIAX Cloud) / sonar (push) Successful in 1m52s
CI (SIAX Cloud) / integration (push) Successful in 11m19s
CI (SIAX Cloud) / quality (push) Successful in 12m21s
This commit was merged in pull request #560.
This commit is contained in:
@@ -106,17 +106,34 @@ jobs:
|
||||
|
||||
# Kanda sarbarheter i lasfilen. osv-scanner 2.x hittar inte alltid
|
||||
# osv-scanner.toml sjalv, sa den skickas explicit nar den finns.
|
||||
# Lasfilsvakten och config-kollen kors i en container som monterar
|
||||
# volymen (FALLA 3 ovan). Kan sjalva sokningen inte koras hoppas OSV
|
||||
# INTE over - da avgor OSV:s egen exitkod, enligt samma policy som ovan.
|
||||
- name: OSV Scanner
|
||||
run: |
|
||||
if ! find /repo -maxdepth 3 \( -name 'pnpm-lock.yaml' -o -name 'package-lock.json' \
|
||||
-o -name 'yarn.lock' -o -name 'poetry.lock' -o -name 'Pipfile.lock' \
|
||||
-o -name 'requirements.txt' -o -name 'go.sum' -o -name 'Cargo.lock' \
|
||||
-o -name 'composer.lock' -o -name 'Gemfile.lock' \) -print -quit | grep -q .; then
|
||||
set +e
|
||||
lock=$(docker run --rm -v "$SCAN_VOLUME:/repo:ro" alpine:3.20 \
|
||||
find /repo -path /repo/.git -prune -o -type f \( \
|
||||
-name 'pnpm-lock.yaml' -o -name 'package-lock.json' -o -name 'yarn.lock' \
|
||||
-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 "::warning::lasfilsvakten kunde inte koras i scanvolymen (rc=$frc) - OSV kors anda"
|
||||
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
|
||||
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
|
||||
docker run --rm -v "$SCAN_VOLUME:/repo" -w /repo \
|
||||
ghcr.io/google/osv-scanner:v2.7.1 scan source --recursive $cfg /repo > /tmp/scan.log 2>&1
|
||||
|
||||
Reference in New Issue
Block a user