testing

dfawley · Oct 23, 2024 · 2bce84c · 2bce84c
1 parent 87c3cb5
commit 2bce84c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml
@@ -35,20 +35,20 @@ jobs:
 
           OUTPUT_DIR="${AFTER}"
           git ls-files -- '*.go' | grep -v '\(^\|/\)\(internal\|examples\|benchmark\|interop\|test\|testdata\)\(/\|$\)' | xargs dirname | sort -u | while read d; do
-            pushd "$d"
+            pushd "$d" > /dev/null
             pkg="$(echo "$d" | sed 's;\.;grpc;' | sed 's;/;_;g')"
             go list -deps . | sort > "${OUTPUT_DIR}/$pkg"
-            popd
+            popd > /dev/null
           done
 
           git checkout origin/master
 
           OUTPUT_DIR="${BEFORE}"
           git ls-files -- '*.go' | grep -v '\(^\|/\)\(internal\|examples\|benchmark\|interop\|test\|testdata\)\(/\|$\)' | xargs dirname | sort -u | while read d; do
-            pushd "$d"
+            pushd "$d" > /dev/null
             pkg="$(echo "$d" | sed 's;\.;grpc;' | sed 's;/;_;g')"
             go list -deps . | sort > "${OUTPUT_DIR}/$pkg"
-            popd
+            popd > /dev/null
           done
 
-          diff --recursive "${BEFORE}" "${AFTER}" || exit 1
+          diff -u0 --recursive "${BEFORE}" "${AFTER}" | grep -v '@@'
diff --git a/scripts/gen-deps.sh b/scripts/gen-deps.sh
@@ -14,8 +14,8 @@ OUTPUT_DIR="$1"
 cd "${SCRIPTS_DIR}/.."
 
 git ls-files -- '*.go' | grep -v '\(^\|/\)\(internal\|examples\|benchmark\|interop\|test\|testdata\)\(/\|$\)' | xargs dirname | sort -u | while read d; do
-  pushd "$d"
+  pushd "$d" > /dev/null
   pkg="$(echo "$d" | sed 's;\.;grpc;' | sed 's;/;_;g')"
   go list -deps . | sort >| "${OUTPUT_DIR}/$pkg"
-  popd
+  popd > /dev/null
 done