From 9fbafab67f9d38726763d5a29bf446aaca00fc87 Mon Sep 17 00:00:00 2001 From: Lior Halphon Date: Sat, 25 Apr 2020 18:04:27 +0300 Subject: [PATCH] Use grep -q, put macOS first, restore -j --- .github/actions/sanity_tests.sh | 4 ++-- .github/workflows/sanity.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/sanity_tests.sh b/.github/actions/sanity_tests.sh index 8d37b68..38302d7 100755 --- a/.github/actions/sanity_tests.sh +++ b/.github/actions/sanity_tests.sh @@ -13,7 +13,7 @@ mv .github/actions/dmg{,-mode}-acid2.bmp --dmg --length 10 .github/actions/dmg-acid2.gb FAILED_TESTS=` -shasum .github/actions/*.bmp | grep -E -v \(\ +shasum .github/actions/*.bmp | grep -q -E -v \(\ 44ce0c7d49254df0637849c9155080ac7dc3ef3d\ \ .github/actions/cgb-acid2.bmp\|\ dbcc438dcea13b5d1b80c5cd06bda2592cc5d9e0\ \ .github/actions/cgb_sound.bmp\|\ 0caadf9634e40247ae9c15ff71992e8f77bbf89e\ \ .github/actions/dmg-acid2.bmp\|\ @@ -24,7 +24,7 @@ f0172cc91867d3343fbd113a2bb98100074be0de\ \ .github/actions/oam_bug-2.bmp\ if [ -n "$FAILED_TESTS" ] ; then echo "Failed the following tests:" - echo $FAILED_TESTS | tr " " "\n" | grep -o -E "[^/]+\.bmp" | sed s/.bmp// | sort + echo $FAILED_TESTS | tr " " "\n" | grep -q -o -E "[^/]+\.bmp" | sed s/.bmp// | sort exit 1 fi diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml index 41404a0..ade68d0 100644 --- a/.github/workflows/sanity.yml +++ b/.github/workflows/sanity.yml @@ -5,7 +5,7 @@ jobs: sanity: strategy: matrix: - os: [ubuntu-latest, ubuntu-16.04, macos-latest] + os: [macos-latest, ubuntu-latest, ubuntu-16.04] cc: [gcc, clang] include: - os: macos-latest