0f4df5d · typeable/servant

git.iko.soy/typeable/servant

Use fixed cabal-install-2.2

commit0f4df5d429b98ef1f7816b6a39b1cfb6305f5cf6 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSat 9 Jun 2018, 10:15 (8 years ago) parentf53370b

1 file changed+5−16

compare with master

unifiedsplit

.travis.yml+5−16

.travis.yml+5−16

@@ -35,19 +35,19 @@ matrix:

3535 include:

3636 - compiler: "ghc-8.4.3"

3737 # 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]}}

3939 - compiler: "ghc-8.2.2"

4040 # 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]}}

4242 - compiler: "ghc-8.0.2"

4343 # 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]}}

4545 - compiler: "ghc-7.10.3"

4646 # 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]}}

4848 - compiler: "ghc-7.8.4"

4949 # 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]}}

5151

5252before_install:

5353 - HC=${CC}

@@ -59,17 +59,6 @@ before_install:

5959 - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))

6060 - echo $HCNUMVER

6161

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−

7362install:

7463 - cabal --version

7564 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"