From e23206e28d2471ccf1034ce48bfc14b6bd9584f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Astor?= Date: Sun, 19 Jan 2020 19:19:53 +0100 Subject: [PATCH] fixes --- .github/workflows/build.yml | 1 + Makefile | 2 +- scripts/test.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb506930..c57989dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -110,6 +110,7 @@ jobs: - name: try mdr run: | export PATH=~/.cabal/bin:$PATH + export PATH=.:$PATH make build git config --local user.email "action@github.com" git config --local user.name "GitHub Action" diff --git a/Makefile b/Makefile index 4f753af3..f35b8b61 100644 --- a/Makefile +++ b/Makefile @@ -24,4 +24,4 @@ clean-all: clean clean-tests .SUFFIXES: .gw .test .gw.test: - @sh scripts/test.sh $< "${CONTAINS}" + @bash scripts/test.sh $< "${CONTAINS}" diff --git a/scripts/test.sh b/scripts/test.sh index 05c02009..28b75977 100644 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -24,6 +24,6 @@ noterm() { } -${VALGRIND} ${VALGRIND_OPT} gwion "$1" 2>&1 > log +${VALGRIND} ${VALGRIND_OPT} gwion "$1" &> log shift [ -t 1 ] && interm $@ || noterm $@ -- 2.43.0