divide and conquer

.travis.yml

@@ -1,65 +1,43 @@
 sudo: true
 
-os:
- - linux
- - osx
- 
 language: java
 
-jdk: 
- - oraclejdk7
- - oraclejdk8
- 
 compiler: clang
 
-osx_image: xcode8.1
-
-env:
- - TARGET=java
- - TARGET=csharp
- - TARGET=python2
- - TARGET=python3
- - TARGET=javascript
- - TARGET=cpp
- - TARGET=go
- - TARGET=swift
- 
 matrix:
-  exclude:
+  include:
     - os: linux
-      env: TARGET=swift
-    - os: linux
-      env: TARGET=csharp
       jdk: oraclejdk7
-    - os: linux
-      env: TARGET=python2
-      jdk: oraclejdk7
-    - os: linux
-      env: TARGET=python3
-      jdk: oraclejdk7
-    - os: linux
-      env: TARGET=javascript
-      jdk: oraclejdk7
-    - os: linux
       env: TARGET=cpp
-      jdk: oraclejdk7
     - os: linux
-      env: TARGET=go
       jdk: oraclejdk7
-    - os: osx
       env: TARGET=java
-    - os: osx
+    - os: linux
+      jdk: oraclejdk8
+      env: TARGET=java
+    - os: linux
+      jdk: oraclejdk7
       env: TARGET=csharp
-    - os: osx
+    - os: linux
+      jdk: oraclejdk7
       env: TARGET=python2
-    - os: osx
+    - os: linux
+      jdk: oraclejdk7
       env: TARGET=python3
-    - os: osx
+    - os: linux
+      jdk: oraclejdk7
       env: TARGET=javascript
-    - os: osx
+    - os: linux
-      env: TARGET=cpp
+      jdk: oraclejdk7
-    - os: osx
       env: TARGET=go
+    - os: osx
+      compiler: clang
+      osx_image: xcode8.1
+      env: TARGET=swift
+    - os: osx
+      compiler: clang
+      osx_image: xcode8.1
+      env: TARGET=cpp
 
 before_install:
   - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh

.travis/before-install-osx-cpp.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -euo pipefail
+
+thisdir=$(dirname "$0")
+
+brew update
+
+# Work around apparent rvm bug that is in Travis's Xcode image.
+# https://github.com/direnv/direnv/issues/210
+# https://github.com/travis-ci/travis-ci/issues/6307
+shell_session_update() { :; }

.travis/run-tests-cpp.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mvn -Dtest=cpp.* test # timeout due to no output for 10 min on travis if in parallel
+mvn -q -Dtest=cpp.* test # timeout due to no output for 10 min on travis if in parallel

.travis/run-tests-csharp.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mvn -Dparallel=methods -DthreadCount=4 -Dtest=csharp.* test
+mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=csharp.* test

.travis/run-tests-go.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mvn -Dparallel=methods -DthreadCount=4 -Dtest=go.* test
+mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=go.* test

.travis/run-tests-java.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mvn -Dparallel=methods -DthreadCount=4 -Dtest=java.* test
+mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=java.* test

.travis/run-tests-javascript.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mvn -Dparallel=methods -DthreadCount=4 -Dtest=node.* test
+mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=node.* test

.travis/run-tests-python2.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mvn -Dparallel=methods -DthreadCount=4 -Dtest=python2.* test
+mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=python2.* test

.travis/run-tests-python3.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mvn -Dparallel=methods -DthreadCount=4 -Dtest=python3.* test
+mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=python3.* test

.travis/run-tests-swift.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # only test swift as we develop on os x so likely well tested and its dog slow on travis
-mvn -Dtest=swift.* test
+mvn -q -Dtest=swift.* test