From abd3ba639ef52305c65fe57f9c5adfaa574c5b23 Mon Sep 17 00:00:00 2001 From: Aaron Tomb Date: Tue, 22 Oct 2019 16:44:01 -0700 Subject: [PATCH] Update CI configuration to use GHC 8.{4,6,8} --- .appveyor.yml | 16 +++-- .travis.yml | 23 +++---- cabal.GHC84.config | 2 +- cabal.GHC86.config | 2 +- cabal.GHC88.config | 150 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 173 insertions(+), 20 deletions(-) create mode 100644 cabal.GHC88.config diff --git a/.appveyor.yml b/.appveyor.yml index 593afea7..87af1f9c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,15 +1,21 @@ +environment: + matrix: + - GHC_VERSION: 8.4.4 + - GHC_VERSION: 8.6.5 + - GHC_VERSION: 8.8.1 + install: # Using '-y' and 'refreshenv' as a workaround to: # https://github.com/haskell/cabal/issues/3687 - - choco install -y ghc --version 8.4.4 + - choco install -y ghc --version $(GHC_VERSION) - refreshenv # See http://help.appveyor.com/discussions/problems/6312-curl-command-not-found#comment_42195491 # NB: Do this after refreshenv, otherwise it will be clobbered! - set PATH=C:\Program Files\Git\mingw64\bin;%PATH%;C:\msys64\usr\bin - - curl -o z3.zip -L https://github.com/Z3Prover/z3/releases/download/z3-4.5.0/z3-4.5.0-x64-win.zip + - curl -o z3.zip -L https://github.com/Z3Prover/z3/releases/download/z3-4.7.1/z3-4.7.1-x64-win.zip - 7z x -bd z3.zip - - cp z3-4.5.0-x64-win/bin/z3.exe . + - cp z3-4.7.1-x64-win/bin/z3.exe . build_script: - - cabal new-update - - cabal new-build + - cabal v2-update + - cabal v2-build diff --git a/.travis.yml b/.travis.yml index 37930605..185a4428 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,12 +10,15 @@ cache: matrix: include: - - env: CABALVER="2.4" GHCVER="8.6.3" - compiler: ": #GHC 8.6.3" - addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}} -# - os: osx -# env: CABALVER="2.4" GHCVER="8.6.3" -# compiler: ": #GHC 8.6.3" + - env: CABALVER="2.4" GHCVER="8.4.4" GHCSHORTVER="84" + compiler: ": #GHC 8.4.4" + addons: {apt: {packages: [cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}} + - env: CABALVER="3.0" GHCVER="8.6.5" GHCSHORTVER="86" + compiler: ": #GHC 8.6.5" + addons: {apt: {packages: [cabal-install-3.0,ghc-8.6.5], sources: [hvr-ghc]}} + - env: CABALVER="3.0" GHCVER="8.8.1" GHCSHORTVER="88" + compiler: ": #GHC 8.8.1" + addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}} before_install: - if [[ $TRAVIS_OS_NAME == 'linux' ]]; @@ -27,16 +30,10 @@ before_install: mv z3 $HOME/bin/z3; z3 --version; fi - - if [[ $TRAVIS_OS_NAME == 'osx' ]]; - then - brew update; - brew install ghc cabal-install z3; - export PATH=$HOME/.cabal/bin:$PATH; - fi - env script: - - cp cabal.GHC86.config cabal.project.freeze + - cp cabal.${GHCSHORTVER}.config cabal.project.freeze - cabal update - bash cry build - bash cry test diff --git a/cabal.GHC84.config b/cabal.GHC84.config index aff21f58..21e9f499 100644 --- a/cabal.GHC84.config +++ b/cabal.GHC84.config @@ -72,7 +72,7 @@ constraints: FloatingHex ==0.4, monad-par ==0.3.4.8, monad-par -chaselev -newgeneric, monad-par-extras ==0.3.3, - monadLib ==3.9, + monadLib ==3.10, mwc-random ==0.14.0.0, old-locale ==1.0.0.7, optparse-applicative ==0.15.0.0, diff --git a/cabal.GHC86.config b/cabal.GHC86.config index 9bdc861b..ceef9d7e 100644 --- a/cabal.GHC86.config +++ b/cabal.GHC86.config @@ -69,7 +69,7 @@ constraints: FloatingHex ==0.4, monad-par ==0.3.4.8, monad-par -chaselev -newgeneric, monad-par-extras ==0.3.3, - monadLib ==3.9, + monadLib ==3.10, mwc-random ==0.14.0.0, old-locale ==1.0.0.7, optparse-applicative ==0.15.0.0, diff --git a/cabal.GHC88.config b/cabal.GHC88.config new file mode 100644 index 00000000..2c1d4772 --- /dev/null +++ b/cabal.GHC88.config @@ -0,0 +1,150 @@ +constraints: any.FloatingHex ==0.4, + any.Glob ==0.10.0, + any.GraphSCC ==1.0.4, + GraphSCC -use-maps, + any.HUnit ==1.6.0.0, + any.Only ==0.1, + any.QuickCheck ==2.13.2, + QuickCheck +templatehaskell, + any.abstract-deque ==0.3, + abstract-deque -usecas, + any.abstract-par ==0.3.3, + any.aeson ==1.4.5.0, + aeson -bytestring-builder -cffi -developer -fast, + any.alex ==3.2.4, + alex +small_base, + any.ansi-terminal ==0.10.1, + ansi-terminal -example, + any.ansi-wl-pprint ==0.6.9, + ansi-wl-pprint -example, + any.array ==0.5.4.0, + any.async ==2.2.2, + async -bench, + any.attoparsec ==0.13.2.3, + attoparsec -developer, + any.base ==4.13.0.0, + any.base-compat ==0.11.0, + any.base-compat-batteries ==0.11.0, + any.base-orphans ==0.8.1, + any.binary ==0.8.7.0, + any.binary-orphans ==1.0.1, + any.blaze-builder ==0.4.1.0, + any.blaze-html ==0.9.1.2, + any.blaze-markup ==0.8.2.3, + any.bytestring ==0.10.9.0, + any.bytestring-builder ==0.10.8.2.0, + bytestring-builder +bytestring_has_builder, + any.call-stack ==0.2.0, + any.cassava ==0.5.2.0, + cassava +bytestring--lt-0_10_4, + any.cereal ==0.5.8.1, + cereal -bytestring-builder, + any.code-page ==0.2, + any.colour ==2.3.5, + any.containers ==0.6.2.1, + any.crackNum ==2.3, + any.criterion ==1.5.6.1, + criterion -embed-data-files -fast, + any.criterion-measurement ==0.1.2.0, + criterion-measurement -fast, + any.cryptohash-sha1 ==0.11.100.1, + cryptol +relocatable -static, + cryptol-test-runner -static, + any.data-default-class ==0.1.2.0, + any.deepseq ==1.4.4.0, + any.dense-linear-algebra ==0.1.0.0, + any.directory ==1.3.3.2, + any.dlist ==0.8.0.7, + any.exceptions ==0.10.3, + any.extensible-exceptions ==0.1.1.4, + any.filepath ==1.4.2.1, + any.generic-deriving ==1.13, + generic-deriving +base-4-9, + any.ghc ==8.8.1, + any.ghc-boot ==8.8.1, + any.ghc-boot-th ==8.8.1, + any.ghc-heap ==8.8.1, + any.ghc-prim ==0.5.3, + any.ghci ==8.8.1, + any.gitrev ==1.3.1, + any.happy ==1.19.12, + happy +small_base, + any.hashable ==1.3.0.0, + hashable -examples +integer-gmp +sse2 -sse41, + any.haskeline ==0.7.5.0, + any.heredoc ==0.2.0.0, + any.hostname ==1.0, + any.hpc ==0.6.0.3, + any.hsc2hs ==0.68.6, + hsc2hs -in-ghc-tree, + any.integer-gmp ==1.0.2.0, + any.integer-logarithms ==1.0.3, + integer-logarithms -check-bounds +integer-gmp, + any.js-flot ==0.8.3, + any.js-jquery ==3.3.1, + any.math-functions ==0.3.3.0, + math-functions +system-erf +system-expm1, + any.microstache ==1.0.1.1, + any.monad-control ==1.0.2.3, + any.monad-par ==0.3.4.8, + monad-par -chaselev -newgeneric, + any.monad-par-extras ==0.3.3, + any.monadLib ==3.10, + any.mtl ==2.2.2, + any.mwc-random ==0.14.0.0, + any.old-locale ==1.0.0.7, + any.optparse-applicative ==0.15.1.0, + any.panic ==0.4.0.1, + any.parallel ==3.2.2.0, + any.parsec ==3.1.14.0, + any.pretty ==1.1.3.6, + any.primitive ==0.7.0.0, + any.process ==1.6.5.1, + any.random ==1.1, + any.regex-base ==0.94.0.0, + any.regex-posix ==0.96.0.0, + regex-posix -_regex-posix-clib, + any.rts ==1.0, + any.sbv ==8.5, + sbv -skiphlinttester, + any.scientific ==0.3.6.2, + scientific -bytestring-builder -integer-simple, + any.simple-get-opt ==0.3, + any.simple-smt ==0.9.4, + any.splitmix ==0.0.3, + splitmix -optimised-mixer +random, + any.statistics ==0.15.1.1, + any.stm ==2.5.0.0, + any.strict ==0.3.2, + strict +split-base, + any.syb ==0.7.1, + any.tagged ==0.8.6, + tagged +deepseq +transformers, + any.template-haskell ==2.15.0.0, + any.terminfo ==0.4.1.4, + any.test-framework ==0.8.2.0, + any.test-framework-hunit ==0.3.0.2, + test-framework-hunit -base3 +base4, + any.test-lib ==0.2, + any.text ==1.2.4.0, + any.tf-random ==0.5, + any.th-abstraction ==0.3.1.0, + any.time ==1.9.3, + any.time-compat ==1.9.2.2, + time-compat -old-locale, + any.transformers ==0.5.6.2, + any.transformers-base ==0.4.5.2, + transformers-base +orphaninstances, + any.transformers-compat ==0.6.5, + transformers-compat -five -five-three -four +generic-deriving +mtl -three -two, + any.unix ==2.7.2.2, + any.unordered-containers ==0.2.10.0, + unordered-containers -debug, + any.uuid-types ==1.0.3, + any.vector ==0.12.0.3, + vector +boundschecks -internalchecks -unsafechecks -wall, + any.vector-algorithms ==0.8.0.1, + vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, + any.vector-binary-instances ==0.2.5.1, + any.vector-th-unbox ==0.2.1.7, + any.xml ==1.3.14