From 985ca2530d475f6bf93fa81d31cc220fccddeea8 Mon Sep 17 00:00:00 2001 From: Vidar Holen Date: Sun, 11 Dec 2022 16:34:29 -0800 Subject: [PATCH] Add Docker testing for older and newer Ubuntu versions --- test/buildtest | 3 ++- test/distrotest | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/buildtest b/test/buildtest index 1d194fc..469539b 100755 --- a/test/buildtest +++ b/test/buildtest @@ -22,7 +22,8 @@ fi cabal install --dependencies-only --enable-tests "${flags[@]}" || cabal install --dependencies-only "${flags[@]}" || - die "can't install dependencies" + cabal install --dependencies-only --max-backjumps -1 "${flags[@]}" || + die "can't install dependencies" cabal configure --enable-tests "${flags[@]}" || die "configure failed" cabal build || diff --git a/test/distrotest b/test/distrotest index 464768c..e1711ea 100755 --- a/test/distrotest +++ b/test/distrotest @@ -67,7 +67,10 @@ fedora:latest dnf install -y cabal-install ghc-template-haskell-devel fi archlinux:latest pacman -S -y --noconfirm cabal-install ghc-static base-devel # Ubuntu LTS +ubuntu:22.04 apt-get update && apt-get install -y cabal-install ubuntu:20.04 apt-get update && apt-get install -y cabal-install +ubuntu:18.04 apt-get update && apt-get install -y cabal-install +ubuntu:16.04 apt-get update && apt-get install -y cabal-install # Stack on Ubuntu LTS 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 -- GitLab