summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2015-02-21 15:42:39 +0100
committerJoachim Breitner <mail@joachim-breitner.de>2015-02-21 15:42:39 +0100
commitd4b645337d2d1a2fb4cfbbef0e5a160c5384f792 (patch)
treee7f7132890c2717691a29ee2c50a65b8b6772bf0 /.travis.yml
parent547c40a324a4649c558147bb72befe1b9d7edf0d (diff)
downloadhaskell-d4b645337d2d1a2fb4cfbbef0e5a160c5384f792.tar.gz
Unbreak travis by installing llvm-3.6
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index dd4606ff1c..91c3baf4ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,12 @@ 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 sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.6-binaries main' >> /etc/apt/sources.list"
+ - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
- 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 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
+ - travis_retry sudo apt-get install cabal-install-1.18 ghc-7.6.3 alex-3.1.3 happy-1.19.4
+ - travis_retry sudo apt-get install llvm-3.6
+ - 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.6/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/