Remove constraints on cabal install, as we made the most progress with that...

This commit is contained in:
Iavor Diatchki 2021-04-22 15:13:52 -07:00
parent a7daa1e9c0
commit b2a8a23798
3 changed files with 4 additions and 4 deletions

4
.github/ci.sh vendored
View File

@ -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() {

View File

@ -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 .) \

2
cry
View File

@ -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() {