@@ -45,12 +45,9 @@ matrix:
4545 # env: TEST=--disable-tests BENCH=--disable-benchmarks
4646 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
4747 - compiler: "ghc-8.4.1"
48− env: GHCHEAD=true
48+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
4949 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
5050
51− allow_failures:
52− - compiler: "ghc-8.4.1"
53−
5451before_install:
5552 - HC=${CC}
5653 - HCPKG=${HC/ghc/ghc-pkg}
@@ -73,21 +70,6 @@ install:
7370 - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
7471 - rm -fv cabal.project cabal.project.local
7572 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
76− # Overlay Hackage Package Index for GHC HEAD: https://github.com/hvr/head.hackage
77− - |
78− if $GHCHEAD; then
79− sed -i.bak 's/-- allow-newer:.*/allow-newer: *:base, *:template-haskell, *:ghc, *:Cabal/' ${HOME}/.cabal/config
80−
81− echo 'repository head.hackage' >> ${HOME}/.cabal/config
82− echo ' url: http://head.hackage.haskell.org/' >> ${HOME}/.cabal/config
83− echo ' secure: True' >> ${HOME}/.cabal/config
84− echo ' root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740' >> ${HOME}/.cabal/config
85− echo ' 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb' >> ${HOME}/.cabal/config
86− echo ' 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e' >> ${HOME}/.cabal/config
87− echo ' key-threshold: 3' >> ${HOME}/.cabal.config
88−
89− cabal new-update head.hackage -v
90− fi
9173 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
9274 - "printf 'packages: \".\"\\n' > cabal.project"
9375 - cat cabal.project
@@ -97,7 +79,7 @@ install:
9779 - rm -f cabal.project.freeze
9880 - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
9981 - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
100− - rm -rf "."/.ghc.environment.* "."/dist
82+ - rm -rf .ghc.environment.* "."/dist
10183 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
10284
10385# Here starts the actual work to be performed for the package under test;