From 3077012c111a4fd3d68e14b25e60bbf6067694d2 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 15 Mar 2021 15:28:44 -0400
Subject: [PATCH] try to catch and report morph error

---
 ci-tools/vulnerability-scan | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ci-tools/vulnerability-scan b/ci-tools/vulnerability-scan
index d1b7a12e..870962fb 100755
--- a/ci-tools/vulnerability-scan
+++ b/ci-tools/vulnerability-scan
@@ -21,8 +21,13 @@ OUTPUT=$1
 [ -e scan-target ] && rm -v scan-target
 nix-shell --run '
 set -x
-object=$(morph build morph/grid/testing/grid.nix 2>&1 | tail -n 1)
-ln -s "$object" scan-target
+if morph_result=$(morph build morph/grid/testing/grid.nix 2>&1); then
+  object=$(echo "$morph_result" | tail -n 1)
+  ln -s "$object" scan-target
+else
+  echo "$morph_result"
+  exit 1
+fi
 '
 
 nix-shell -p vulnix --run 'vulnix ./scan-target/' | tee "$OUTPUT"
-- 
GitLab