ci(graph): reserve stdout for parsable output

Agoric · Aug 8, 2023 · 242f953 · 242f953
1 parent 2e351ba
commit 242f953
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/scripts/check-dependency-cycles.sh b/scripts/check-dependency-cycles.sh
@@ -2,12 +2,9 @@
 # Errors if number of cycle edges detected is too great
 set -ueo pipefail
 
-MAX_EDGES=$1
+MAX_EDGES=${1-0}
 
-# one of these lines is "Cycles detected"
-LINE_COUNT=$(scripts/graph.sh |wc -l)
-
-CYCLIC_EDGE_COUNT=$((LINE_COUNT - 1))
+CYCLIC_EDGE_COUNT=$(scripts/graph.sh | wc -l)
 
 echo CYCLIC_EDGE_COUNT $CYCLIC_EDGE_COUNT
 

diff --git a/scripts/graph.sh b/scripts/graph.sh
@@ -26,8 +26,8 @@ dot -Tpng <packages-graph.dot >"$DIR"/../packages-graph.png
 dot -Tsvg <packages-graph.dot >"$DIR"/../packages-graph.svg
 
 if acyclic packages-graph.dot | dot -Tcanon >packages-graph-sans-cycles.dot; then
-    echo "No cycles in 'dependencies' of packages."
+    echo 1>&2 "No cycles in 'dependencies' of packages."
 else
-    echo "Cycles detected. These lines appear only in the original graph and not the acyclic variant:"
+    echo 1>&2 "Cycles detected. Output lines appear only in the original graph and not the acyclic variant:"
     comm -23 <(sort packages-graph.dot) <(sort packages-graph-sans-cycles.dot)
 fi