summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-03 08:28:20 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-03 08:28:20 (GMT)
commit21e5079881531ebceefe721e59d840825dcbaa62 (patch)
tree79529c878eb77b9efa43ce915061502706101f5c /.github
parentd468d7d09254c80b383af546b4f669684b92d366 (diff)
downloadtk-21e5079881531ebceefe721e59d840825dcbaa62.zip
tk-21e5079881531ebceefe721e59d840825dcbaa62.tar.gz
tk-21e5079881531ebceefe721e59d840825dcbaa62.tar.bz2
'grep -q "Failed' should be followed by single tab. Try to fix mingw-gcc build
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/mac-build.yml2
-rw-r--r--.github/workflows/win-build.yml15
2 files changed, 5 insertions, 12 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index fb546a7..c06afce 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -102,7 +102,7 @@ jobs:
echo "::error::Failure during Test"
exit 1
}
- cat out-classic.txt out-ttk.txt | grep -q "Failed[[:space:]][[:space:]]*[1-9]" && {
+ cat out-classic.txt out-ttk.txt | grep -q "Failed [1-9]" && {
echo "::error::Failure during Test"
exit 1
}
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 504037d..317bfc9 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -60,7 +60,7 @@ jobs:
echo "::error::Failure during Test"
exit 1
}
- cat out-classic.txt out-ttk.txt | grep -q "Failed [1-9]" && {
+ cat out-classic.txt out-ttk.txt | grep -q "Failed [1-9]" && {
echo "::error::Failure during Test"
exit 1
}
@@ -141,15 +141,8 @@ jobs:
}
- name: Run Tests
run: |
- make test-classic | tee out-classic.txt || {
+ make test-classic | tee out-classic.txt || echo "::error::Failure during Test"
+ make test-ttk | tee out-ttk.txt || echo "::error::Failure during Test"
+ cat out-classic.txt out-ttk.txt | grep -q "Failed [1-9]" && {
echo "::error::Failure during Test"
- exit 1
- }
- make test-ttk | tee out-ttk.txt || {
- echo "::error::Failure during Test"
- exit 1
- }
- cat out-classic.txt out-ttk.txt | grep -q "Failed [1-9]" && {
- echo "::error::Failure during Test"
- exit 1
}