From 6700707c3183739cc1d01eadad06974d8de4d8de Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 22 Mar 2021 14:38:29 -0400
Subject: [PATCH] emit json instead of text
---
.gitlab-ci.yml | 2 +-
ci-tools/vulnerability-scan | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e3186bf..90143be0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ unit-tests:
vulnerability-scan:
stage: "test"
script:
- - "ci-tools/vulnerability-scan security-report.txt"
+ - "ci-tools/vulnerability-scan security-report.json"
artifacts:
paths:
- "security-report.txt"
diff --git a/ci-tools/vulnerability-scan b/ci-tools/vulnerability-scan
index 0a3a7762..48bf51e0 100755
--- a/ci-tools/vulnerability-scan
+++ b/ci-tools/vulnerability-scan
@@ -42,7 +42,7 @@ fi
# (non-whitelisted errors). 3 indicates unexpected error so we let that
# propagate.
set +e
-nix-shell -p vulnix --run 'vulnix ./scan-target/' | tee "$OUTPUT"
+nix-shell -p vulnix --run 'vulnix --json ./scan-target/' | tee "$OUTPUT"
vulnix_status=$?
set -e
--
GitLab