Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
666c231f2a
@ -10,7 +10,7 @@ install:
|
||||
# - ( $CABAL122 && cabal install cabal-install --constraint "Cabal >= 1.22" && ghc-pkg unregister Cabal ) || true
|
||||
- echo $PATH
|
||||
- which cabal
|
||||
# - cabal install Cabal --constraint "Cabal == $(cabal --version | grep 'Cabal library' | awk '{ print $3 }' | tail -n1)"
|
||||
- if [ -n "$(cabal --version | grep 'Cabal library' | awk '{ print $3 }' | tail -n1 | sed -n '/^1.18/p')" ]; then cabal install cabal-install --constraint "Cabal == 1.18.* && > 1.18.0"; fi
|
||||
- cabal install happy
|
||||
- happy --version
|
||||
- cabal install -j --only-dependencies --enable-tests --constraint "tagged < 0.8"
|
||||
@ -26,7 +26,6 @@ script:
|
||||
- if [ -n "$(ghc --version | awk '{ print $8 }' | sed -n '/^7.8/p')" ]; then export WERROR="--ghc-option=-Werror"; fi
|
||||
- cabal configure --enable-tests $WERROR
|
||||
- cabal build
|
||||
- export cabal_helper_libexecdir=$HOME/.cabal/bin
|
||||
- export ghc_mod_datadir=$PWD
|
||||
- cabal test
|
||||
|
||||
|
@ -121,7 +121,7 @@ Library
|
||||
, bytestring
|
||||
, cereal >= 0.4
|
||||
, containers
|
||||
, cabal-helper >= 0.3.2.0
|
||||
, cabal-helper >= 0.3.3.0
|
||||
, deepseq
|
||||
, directory
|
||||
, filepath
|
||||
|
Loading…
Reference in New Issue
Block a user