summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2014-12-16 10:54:36 +0100
committerJoachim Breitner <mail@joachim-breitner.de>2014-12-16 12:32:25 +0100
commit4a7489b186de351410a3676c7f1d85b426431dc0 (patch)
treea666be69e26fb0ae905b10cef49ba5bb4d030015 /.travis.yml
parent06ba9818e2f99ff3ce0430a61a2be9df618d6488 (diff)
downloadhaskell-4a7489b186de351410a3676c7f1d85b426431dc0.tar.gz
Use llvm-3.5 on Travis
to avoid a build failure with T5681(optllvm). According to Ben Gamari, llvm-3.4 is known to be not working with GHC HEAD.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index cc9ac3f30b..dd4606ff1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,11 @@ env:
before_install:
- travis_retry sudo add-apt-repository -y ppa:hvr/ghc
+ - travis_retry sudo add-apt-repository -y ppa:h-rayflood/gcc-upper
+ - travis_retry sudo add-apt-repository -y ppa:h-rayflood/llvm-upper
- travis_retry sudo apt-get update
- - travis_retry sudo apt-get install cabal-install-1.18 ghc-7.6.3 alex-3.1.3 happy-1.19.4
- - export PATH=/opt/ghc/7.6.3/bin:/opt/cabal/1.18/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:$PATH
+ - travis_retry sudo apt-get install cabal-install-1.18 ghc-7.6.3 alex-3.1.3 happy-1.19.4 llvm-3.5
+ - export PATH=/opt/ghc/7.6.3/bin:/opt/cabal/1.18/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/lib/llvm-3.5/bin:$PATH
- git config --global url."git://github.com/ghc/packages-".insteadOf git://github.com/ghc/packages/
- git config --global url."http://github.com/ghc/packages-".insteadOf http://github.com/ghc/packages/
- git config --global url."https://github.com/ghc/packages-".insteadOf https://github.com/ghc/packages/