From 2b4744f2f29e46f57c0dbd99d7fa94b9a2c4f435 Mon Sep 17 00:00:00 2001
From: kai <kai@redstar.de>
Date: Sat, 15 Jun 2013 15:02:41 +0200
Subject: [PATCH] Add LLVM 3.2/3/4 to Travis CI.

Changes the Travis CI configuration to use the following packages:
- LLVM 3.1 from precise
- LLVM 3.2 from precise-proposed
- LLVM 3.3 and 3.4 from llvm.org snapshot

LLVM 3.4 builds are allowed to fail because this is a development snaphot.
Reorganizes the cmake command line, too.
---
 .travis.yml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 99c0de9f..66cf4e92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,25 @@
 language: cpp
 install:
-  - echo yes | sudo add-apt-repository ppa:dr-graef/llvm-3.1.precise
+  - sudo sudo sh -c "echo 'deb http://archive.ubuntu.com/ubuntu/ precise-proposed restricted main multiverse universe' >> /etc/apt/sources.list"
+  - sudo 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 -
   - sudo apt-get update -qq
   - sudo apt-get install -qq $LLVM_PACKAGE libconfig++8-dev
 env:
-  - DVER=2 LLVM_PACKAGE=llvm-3.1 LLVM_VERSION=3.1 TESTSUITE_FILTER=debug
-  - DVER=2 LLVM_PACKAGE=llvm-3.1 LLVM_VERSION=3.1 TESTSUITE_FILTER=release
+  - LLVM_PACKAGE="llvm-3.1 llvm-3.1-dev" TESTSUITE_FILTER=debug
+  - LLVM_PACKAGE="llvm-3.1 llvm-3.1-dev" TESTSUITE_FILTER=release
+  - LLVM_PACKAGE="llvm-3.2 llvm-3.2-dev" TESTSUITE_FILTER=debug
+  - LLVM_PACKAGE="llvm-3.2 llvm-3.2-dev" TESTSUITE_FILTER=release
+  - LLVM_PACKAGE="llvm-3.3 llvm-3.3-dev" TESTSUITE_FILTER=debug
+  - LLVM_PACKAGE="llvm-3.3 llvm-3.3-dev" TESTSUITE_FILTER=release
+  - LLVM_PACKAGE="llvm-3.4 llvm-3.4-dev" TESTSUITE_FILTER=debug
+  - LLVM_PACKAGE="llvm-3.4 llvm-3.4-dev" TESTSUITE_FILTER=release
+matrix:
+  allow_failures:
+    - env: LLVM_PACKAGE="llvm-3.4 llvm-3.4-dev" TESTSUITE_FILTER=debug
+    - env: LLVM_PACKAGE="llvm-3.4 llvm-3.4-dev" TESTSUITE_FILTER=release
 script:
-  - cmake -DD_VERSION=$DVER -DLLVM_CONFIG=/usr/bin/llvm-config-$LLVM_VERSION
+  - cmake .
   - make
   - bin/ldc2 -version # For environment info.
   - ctest --output-on-failure -R $TESTSUITE_FILTER