git.iko.soy/typeable/aeson
on master help sign in
Add GHC-8.8.1 Travis job

Use cabal2 method for GHC-8.8.1 / cabal-install-3.0

commit02a02a02a3ebeccb9f6235eece9e90d97cafc5d5 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSun 11 Aug 2019, 11:58 (7 years ago) parentc4028c3
5 files changed+38−19
compare with master
unifiedsplit
.travis.yml+24−16 aeson.cabal+2−2 cabal.project+2−1 travis/install.sh+6 travis/script.sh+4
.travis.yml+24−16
@@ -12,29 +12,37 @@ cache:
1212 - $HOME/.stack
1313 - $HOME/.cabsnap
1414 - $HOME/.cabal/packages
15+ - $HOME/.cabal/store
1516
1617before_cache:
1718 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
18− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
19+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
20+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
21+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
22+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
23+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
1924
2025matrix:
2126 include:
22− - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.3
23− compiler: ": #GHC 8.4.3"
24− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
25− - env: BUILD=stack CABALVER=2.2 GHCVER=8.4.3 STACK_YAML=stack-bench.yaml
26− compiler: ": #GHC 8.4.3"
27− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
28− - env: BUILD=stack CABALVER=2.2 GHCVER=8.4.3 STACK_YAML=stack-ffi-unescape.yaml
29− compiler: ": #GHC 8.4.3"
30− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
27+ - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4
28+ compiler: ": #GHC 8.4.4"
29+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
30+ - env: BUILD=stack CABALVER=2.2 GHCVER=8.4.4 STACK_YAML=stack-bench.yaml
31+ compiler: ": #GHC 8.4.4"
32+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
33+ - env: BUILD=stack CABALVER=2.2 GHCVER=8.4.4 STACK_YAML=stack-ffi-unescape.yaml
34+ compiler: ": #GHC 8.4.4"
35+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
3136
32− - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.1
33− compiler: ": #GHC 8.6.1"
34− addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
35− - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.3
36− compiler: ": #GHC 8.4.3"
37− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
37+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.8.1
38+ compiler: ": #GHC 8.8.1"
39+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}
40+ - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.5
41+ compiler: ": #GHC 8.6.5"
42+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
43+ - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.4
44+ compiler: ": #GHC 8.4.4"
45+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
3846 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2
3947 compiler: ": #GHC 8.2.2"
4048 addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
aeson.cabal+2−2
@@ -107,9 +107,9 @@ library
107107 containers >= 0.4.2.1 && < 0.7,
108108 deepseq >= 1.3.0.0 && < 1.5,
109109 ghc-prim >= 0.2 && < 0.6,
110− template-haskell >= 2.7.0.0 && < 2.15,
110+ template-haskell >= 2.7.0.0 && < 2.16,
111111 text >= 1.2.3.0 && < 1.3,
112− time >= 1.4 && < 1.9
112+ time >= 1.4 && < 1.10
113113
114114 if impl(ghc >= 8.0)
115115 build-depends: bytestring >= 0.10.8.1
cabal.project+2−1
@@ -1,3 +1,4 @@
11with-compiler: ghc
22packages: .
3−packages: attoparsec-iso8601, benchmarks
3+packages: attoparsec-iso8601
4+-- packages: benchmarks
travis/install.sh+6
@@ -49,4 +49,10 @@ case $BUILD in
4949 cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
5050 fi
5151 ;;
52+ cabal2)
53+ cabal v2-update -v
54+ sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
55+
56+ cabal v2-build --only-dependencies --enable-tests --enable-benchmarks --dry
57+ ;;
5258esac
travis/script.sh+4
@@ -19,6 +19,10 @@ case $BUILD in
1919 SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
2020 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
2121 ;;
22+ cabal2)
23+ cabal v2-build --enable-tests --enable-benchmarks
24+ cabal v2-test --enable-tests --enable-benchmarks
25+ ;;
2226 hlint)
2327 make lint
2428 ;;