Skip to content

Commit 71f1db6

Browse files
committed
Update distro tests
1 parent bcca66e commit 71f1db6

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

test/distrotest

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ ubuntu:latest apt-get update && apt-get install -y cabal-install
6464
haskell:latest true
6565
opensuse/leap:latest zypper install -y cabal-install ghc
6666
fedora:latest dnf install -y cabal-install ghc-template-haskell-devel findutils
67-
archlinux/base:latest pacman -S -y --noconfirm cabal-install ghc-static base-devel
67+
archlinux:latest pacman -S -y --noconfirm cabal-install ghc-static base-devel
6868
69-
# Other versions we want to support
70-
ubuntu:18.04 apt-get update && apt-get install -y cabal-install
69+
# Ubuntu LTS
70+
ubuntu:20.04 apt-get update && apt-get install -y cabal-install
7171
72-
# Misc Haskell including current and latest Stack build
73-
ubuntu:18.04 set -e; apt-get update && apt-get install -y curl && curl -sSL https://get.haskellstack.org/ | sh -s - -f && cd /mnt && exec test/stacktest
72+
# Stack on Ubuntu LTS
73+
ubuntu:20.04 set -e; apt-get update && apt-get install -y curl && curl -sSL https://get.haskellstack.org/ | sh -s - -f && cd /mnt && exec test/stacktest
7474
EOF
7575

7676
exit "$final"

test/stacktest

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ command -v stack ||
1818
stack setup || die "Failed to setup with default resolver"
1919
stack build --test || die "Failed to build/test with default resolver"
2020

21+
# Nice to haves, but not necessary
2122
for resolver in "${resolvers[@]}"
2223
do
23-
stack --resolver="$resolver" setup || die "Failed to setup $resolver"
24-
stack --resolver="$resolver" build --test || die "Failed build/test with $resolver!"
24+
stack --resolver="$resolver" setup || die "Failed to setup $resolver. This probably doesn't matter."
25+
stack --resolver="$resolver" build --test || die "Failed build/test with $resolver! This probably doesn't matter."
2526
done
2627

2728
echo "Success"

0 commit comments

Comments
 (0)