Merge pull request #1547 from joshk/patch-1

Use the new Docker queue on Travis

.travis.yml

@@ -1,7 +1,16 @@
 language: scala
-script:
-  - sbt "$SCRIPTED_TEST"
+
+# TODO - we'd like to actually test everything, but the process library has a deadlock right now
+jdk:
+  - openjdk6
+#  - oraclejdk7
+
+sudo: false
+
 env:
+  global:
+    - JVM_OPTS="-Xms1024m -Xmx1024m -XX:ReservedCodeCacheSize=128m -XX:MaxPermSize=256m"
+  matrix:
     - SCRIPTED_TEST="scripted actions/*"
     - SCRIPTED_TEST="scripted api/*"
     - SCRIPTED_TEST="scripted compiler-project/*""
@@ -19,12 +28,11 @@ env:
     - SCRIPTED_TEST="scripted tests/*"
     - SCRIPTED_TEST="safeUnitTests"
     - SCRIPTED_TEST="checkBuildScala211"
-# TODO - we'd like to actually test everything, but the process library has a deadlock right now
-jdk:
-  - openjdk6
-#  - oraclejdk7
+
+script:
+  - sbt "$SCRIPTED_TEST"
+
 notifications:
   email:
     - qbranch@typesafe.com
-before_script:
-  - export JVM_OPTS="-Xms1024m -Xmx1024m -XX:ReservedCodeCacheSize=128m -XX:MaxPermSize=256m"
+