[commit: ghc] wip/travis: travis: Try to install llvm-3.6 (d40aba3)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/travis
Link       : http://ghc.haskell.org/trac/ghc/changeset/d40aba347054fa234ba6d7a6e0b9031b224b3fa8/ghc

>---------------------------------------------------------------

commit d40aba347054fa234ba6d7a6e0b9031b224b3fa8
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Feb 10 22:03:30 2015 +0100

    travis: Try to install llvm-3.6


>---------------------------------------------------------------

d40aba347054fa234ba6d7a6e0b9031b224b3fa8
 .travis.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd4606f..d3de022 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,11 +12,16 @@ 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 add-apt-repository -y ppa:h-rayflood/gcc-upper
+ #- travis_retry sudo add-apt-repository -y ppa:h-rayflood/llvm-upper
+ #- travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+ #- travis_retry sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
+ #- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
+ - travis_retry sudo add-apt-repository -y ppa:xorg-edgers/ppa # seems to be a source for llvm-3.6
  - 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/