---

yaml
---
r: 149593
b: refs/heads/try2
c: bbdaf01
h: refs/heads/master
i:
  149591: 9e03db4
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 1ac5e84e9179fd9c02b5f8d6c46eaab58baa6e4b
+refs/heads/try2: bbdaf01a5aa3ef55b693384465e61db1007a9a09
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.travis.yml

@@ -3,32 +3,23 @@
 # it treats unknown languages as ruby-like I believe.
 language: c
 
-# Before we start doing anything, install the latest stock LLVM. These are
-# maintained by LLVM, and more information can be found at llvm.org/apt.
-#
-# Right now, the highest version is 3.5, and our SVN version is roughly aligned
-# with the 3.5 API (hurray!)
+# Before we start doing anything, install a stock LLVM
 install:
-  - sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
-  - sudo sh -c "echo 'deb-src http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
-  - sudo sh -c "echo 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu 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 -y --force-yes -qq llvm-3.5 llvm-3.5-dev clang-3.5 lldb-3.5
+  - sudo apt-get install llvm-3.3 llvm-3.3-dev clang-3.3 lldb-3.3
 
-# All of the llvm tools are suffixed with "-3.5" which we don't want, so symlink
+# All of the llvm tools are suffixed with "-3.3" which we don't want, so symlink
 # them all into a local directory and just use that
 #
 # FIXME: this shouldn't update the src/llvm sub-repo, that takes about a minute
 #        it's gotta download so much stuff.
 before_script:
   - mkdir -p local-llvm/bin
-  - ln -nsf /usr/bin/llvm-config-3.5 local-llvm/bin/llvm-config
-  - ln -nsf /usr/bin/llvm-mc-3.5 local-llvm/bin/llvm-mc
-  - ln -nsf /usr/bin/llvm-as-3.5 local-llvm/bin/llvm-as
-  - ln -nsf /usr/bin/llvm-dis-3.5 local-llvm/bin/llvm-dis
-  - ln -nsf /usr/bin/llc-3.5 local-llvm/bin/llc
-  - ln -nsf /usr/include/llvm-3.5 local-llvm/include
+  - ln -nsf /usr/bin/llvm-config-3.3 local-llvm/bin/llvm-config
+  - ln -nsf /usr/bin/llvm-mc-3.3 local-llvm/bin/llvm-mc
+  - ln -nsf /usr/bin/llvm-as-3.3 local-llvm/bin/llvm-as
+  - ln -nsf /usr/bin/llvm-dis-3.3 local-llvm/bin/llvm-dis
+  - ln -nsf /usr/bin/llc-3.3 local-llvm/bin/llc
+  - ln -nsf /usr/include/llvm-3.3 local-llvm/include
   - ./configure --disable-optimize-tests --llvm-root=`pwd`/local-llvm --enable-fast-make --enable-clang
 
 # Tidy everything up first, then build a few things, and then run a few tests.