From 6e5a57d1bd733a466954ac8164e6c7aacbfdbec8 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Fri, 22 Aug 2014 09:53:26 +0200 Subject: [PATCH 1/2] Use the new Docker queue on Travis faster, better, stronger vms boot in seconds, network is more stable also cleaned up the .travis.yml file a little :) --- .travis.yml | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index a072d1287..b30555bdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,37 @@ language: scala -script: - - sbt "$SCRIPTED_TEST" -env: - - SCRIPTED_TEST="scripted actions/*" - - SCRIPTED_TEST="scripted api/*" - - SCRIPTED_TEST="scripted compiler-project/*"" - - SCRIPTED_TEST="scripted dependency-management/*1of2" - - SCRIPTED_TEST="scripted dependency-management/*2of2" - - SCRIPTED_TEST="scripted java/*" - - SCRIPTED_TEST="scripted package/*" - - SCRIPTED_TEST="scripted project/*1of2" - - SCRIPTED_TEST="scripted project/*2of2" - - SCRIPTED_TEST="scripted reporter/*" - - SCRIPTED_TEST="scripted run/*" - - SCRIPTED_TEST="scripted source-dependencies/*1of3" - - SCRIPTED_TEST="scripted source-dependencies/*2of3" - - SCRIPTED_TEST="scripted source-dependencies/*3of3" - - 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 + +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/*"" + - SCRIPTED_TEST="scripted dependency-management/*1of2" + - SCRIPTED_TEST="scripted dependency-management/*2of2" + - SCRIPTED_TEST="scripted java/*" + - SCRIPTED_TEST="scripted package/*" + - SCRIPTED_TEST="scripted project/*1of2" + - SCRIPTED_TEST="scripted project/*2of2" + - SCRIPTED_TEST="scripted reporter/*" + - SCRIPTED_TEST="scripted run/*" + - SCRIPTED_TEST="scripted source-dependencies/*1of3" + - SCRIPTED_TEST="scripted source-dependencies/*2of3" + - SCRIPTED_TEST="scripted source-dependencies/*3of3" + - SCRIPTED_TEST="scripted tests/*" + - SCRIPTED_TEST="safeUnitTests" + - SCRIPTED_TEST="checkBuildScala211" + +script: + - sbt "$SCRIPTED_TEST" + notifications: email: - qbranch@typesafe.com -before_script: - - export JVM_OPTS="-Xms1024m -Xmx1024m -XX:ReservedCodeCacheSize=128m -XX:MaxPermSize=256m" \ No newline at end of file From f4c20563d7070142e5c84b0a14bc67863fe156a0 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Fri, 22 Aug 2014 11:41:21 +0200 Subject: [PATCH 2/2] bumping the file to run the build again fixed an issue with the Docker workers --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b30555bdf..397db5cfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,3 +35,4 @@ script: notifications: email: - qbranch@typesafe.com +