@@ -29,14 +29,11 @@ before_cache:
2929matrix:
3030 include:
3131 - compiler: "ghc-8.6.1"
32− env: GHCHEAD=true
33− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.6.1], sources: [hvr-ghc]}}
32+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
33+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
3434 - compiler: "ghc-8.4.3"
3535 # env: TEST=--disable-tests BENCH=--disable-benchmarks
36− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
37−
38− allow_failures:
39− - compiler: "ghc-8.6.1"
36+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
4037
4138before_install:
4239 - HC=${CC}
@@ -60,25 +57,8 @@ install:
6057 - travis_retry cabal update -v
6158 - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
6259 - rm -fv cabal.project cabal.project.local
63− # Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
64− - |
65− if $GHCHEAD; then
66− sed -i 's/-- allow-newer: .*/allow-newer: *:base/' ${HOME}/.cabal/config
67− for pkg in $($HCPKG list --simple-output); do pkg=$(echo $pkg | sed 's/-[^-]*$//'); sed -i "s/allow-newer: /allow-newer: *:$pkg, /" ${HOME}/.cabal/config; done
68−
69− echo 'repository head.hackage' >> ${HOME}/.cabal/config
70− echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config
71− echo ' secure: True' >> ${HOME}/.cabal/config
72− echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config
73− echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config
74− echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
75− echo ' key-threshold: 3' >> ${HOME}/.cabal.config
76−
77− grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
78−
79− cabal new-update head.hackage -v
80− fi
8160 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
61+ - (cd /tmp && echo '' | cabal new-repl -w ${HC} --build-dep fail)
8262 - if [ $HCNUMVER -ge 80000 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin doctest --constraint='doctest ==0.16.*'; fi
8363 - if [ $HCNUMVER -eq 80403 ]; then cabal new-install -w ${HC} -j2 --symlink-bindir=$HOME/.local/bin hlint --constraint='hlint ==2.1.*'; fi
8464 - "printf 'packages: \".\"\\n' > cabal.project"
@@ -99,8 +79,8 @@ install:
9979# any command which exits with a non-zero exit code causes the build to fail.
10080script:
10181 # test that source-distributions can be generated
102− - (cd "." && cabal sdist)
103− - mv "."/dist/cabal2nix-*.tar.gz ${DISTDIR}/
82+ - cabal new-sdist all
83+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
10484 - cd ${DISTDIR} || false
10585 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
10686 - "printf 'packages: cabal2nix-*/*.cabal\\n' > cabal.project"
@@ -125,7 +105,6 @@ script:
125105 - (cd cabal2nix-* && cabal check)
126106
127107 # haddock
128− - rm -rf ./dist-newstyle
129108 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
130109
131110 # Build without installed constraints for packages in global-db