diff --git a/.github/ci.sh b/.github/ci.sh index 8063efa0..f48171fe 100755 --- a/.github/ci.sh +++ b/.github/ci.sh @@ -38,8 +38,8 @@ retry() { } setup_external_tools() { - # is_exe "$BIN" "test-runner" && return - cabal v2-install --constraint="test-lib>=0.3" --overwrite-policy=always --install-method=copy --installdir="$BIN" test-lib + is_exe "$BIN" "test-runner" && return + cabal v2-install --install-method=copy --installdir="$BIN" test-lib } setup_dist_bins() { diff --git a/Dockerfile b/Dockerfile index 5294eed1..4d6217bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,7 @@ RUN mkdir -p rootfs/usr/local/bin RUN cabal v2-update && \ cabal v2-build -j cryptol:exe:cryptol && \ cp $(cabal v2-exec which cryptol) rootfs/usr/local/bin && \ - cabal v2-install --constraint="test-lib>=0.3" --install-method=copy --overwrite-policy=always --installdir=bin test-lib + cabal v2-install --install-method=copy --overwrite-policy=always --installdir=bin test-lib RUN ./bin/test-runner --ext=.icry --exe=./rootfs/usr/local/bin/cryptol -F -b tests ENV PATH=/usr/local/bin:/cryptol/rootfs/usr/local/bin:$PATH RUN ! $(cryptol -c ":s prover=yices" | tail -n +2 | grep -q .) \ diff --git a/cry b/cry index 4d1c4ce3..bba30b7f 100755 --- a/cry +++ b/cry @@ -8,7 +8,7 @@ QUICKTESTS="tests/issues tests/modsys tests/mono-binds tests/parser tests/regres function setup_external_tools() { [[ -x "$BIN/test-runner" || -x "$BIN/test-runner.exe" ]] && return - cabal v2-install --constraint="test-lib>=0.3" --install-method=copy --installdir="$BIN" test-lib + cabal v2-install --install-method=copy --installdir="$BIN" test-lib } function show_usage() {