git.iko.soy/typeable/servant
on master help sign in
Merge pull request #973 from phadej/back-to-ppa-cabal
116cf4fOleg Grenrus
.travis.yml+5−16
@@ -35,19 +35,19 @@ matrix:
35 include:
35 include:
36 - compiler: "ghc-8.4.3"
36 - compiler: "ghc-8.4.3"
37 # env: TEST=--disable-tests BENCH=--disable-benchmarks
37 # env: TEST=--disable-tests BENCH=--disable-benchmarks
38− addons: {apt: {packages: [ghc-ppa-tools,ghc-8.4.3], sources: [hvr-ghc]}}
38+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
39 - compiler: "ghc-8.2.2"
39 - compiler: "ghc-8.2.2"
40 # env: TEST=--disable-tests BENCH=--disable-benchmarks
40 # env: TEST=--disable-tests BENCH=--disable-benchmarks
41− addons: {apt: {packages: [ghc-ppa-tools,ghc-8.2.2], sources: [hvr-ghc]}}
41+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
42 - compiler: "ghc-8.0.2"
42 - compiler: "ghc-8.0.2"
43 # env: TEST=--disable-tests BENCH=--disable-benchmarks
43 # env: TEST=--disable-tests BENCH=--disable-benchmarks
44− addons: {apt: {packages: [ghc-ppa-tools,ghc-8.0.2], sources: [hvr-ghc]}}
44+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
45 - compiler: "ghc-7.10.3"
45 - compiler: "ghc-7.10.3"
46 # env: TEST=--disable-tests BENCH=--disable-benchmarks
46 # env: TEST=--disable-tests BENCH=--disable-benchmarks
47− addons: {apt: {packages: [ghc-ppa-tools,ghc-7.10.3], sources: [hvr-ghc]}}
47+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
48 - compiler: "ghc-7.8.4"
48 - compiler: "ghc-7.8.4"
49 # env: TEST=--disable-tests BENCH=--disable-benchmarks
49 # env: TEST=--disable-tests BENCH=--disable-benchmarks
50− addons: {apt: {packages: [ghc-ppa-tools,ghc-7.8.4], sources: [hvr-ghc]}}
50+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
51
51
52before_install:
52before_install:
53 - HC=${CC}
53 - HC=${CC}
@@ -59,17 +59,6 @@ before_install:
59 - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
59 - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
60 - echo $HCNUMVER
60 - echo $HCNUMVER
61
61
62− # Let's download "better" cabal
63− - "curl -L http://oleg.fi/cabal-grayjay-buildable-fix.xz | xz -d > $HOME/.local/bin/cabal"
64− - |
65− if [ "$(cd $HOME/.local/bin && sha256sum cabal)" != "e281e9466b8eef30ac0d1371e8ea83c9d2e856bda4714a728ac474138b09b20f cabal" ]; then
66− rm -f $HOME/.local/bin/cabal;
67− sha256sum $HOME/.local/bin/cabal;
68− false;
69− else
70− chmod a+x $HOME/.local/bin/cabal;
71− fi
72−
73install:
62install:
74 - cabal --version
63 - cabal --version
75 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
64 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"