From 73e8c8aab9f1dd61f922a889abfc6b313a95b07a Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Wed, 15 Nov 2017 10:29:14 -0500
Subject: [PATCH 1/4] Instead of listing and then excluding osx builds, just
 don't list them.

---
 .travis.yml | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e7853ebed8..515abf4826 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,10 @@ script:
 env:
   - CONFIG=cpp
   - CONFIG=cpp_distcheck
-  - CONFIG=golang
-  - CONFIG=java_jdk7
-  - CONFIG=java_oracle7
-  - CONFIG=javanano_jdk7
-  - CONFIG=javanano_oracle7
+  # Testing go requires installing golang, currently travis.sh is doing that
+  #   with apt-get which doesn't work on OS X.
+  # It's nontrivial to programmatically install a new JDK from the command
+  #   line on OS X, so we rely on testing on Linux for Java code.
   - CONFIG=javascript
   # iOS build log was starting to choke travis UI, so split to cover the
   # Xcode Debug and Release Configurations independently.
@@ -34,21 +33,6 @@ env:
   - CONFIG=php5.6_mac
   - CONFIG=php7.0_mac
 matrix:
-  exclude:
-    # It's nontrivial to programmatically install a new JDK from the command
-    # line on OS X, so we rely on testing on Linux for Java code.
-    - os: osx
-      env: CONFIG=java_jdk7
-    - os: osx
-      env: CONFIG=java_oracle7
-    - os: osx
-      env: CONFIG=javanano_jdk7
-    - os: osx
-      env: CONFIG=javanano_oracle7
-    # Requires installing golang, currently travis.sh is doing that with apt-get
-    # which doesn't work on OS X.
-    - os: osx
-      env: CONFIG=golang
   include:
     # The dotnet environment requires Ubuntu 14.04 or 16.04. This
     # configuration is effectively an "extra" one, outside the

From c46571bc171334812553df7e48b8cd4bde433b07 Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Wed, 15 Nov 2017 10:31:16 -0500
Subject: [PATCH 2/4] Update some comments about testing.

---
 .travis.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 515abf4826..b6c19d244a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,10 @@
 sudo: required
 dist: trusty
-# Note: travis currently does not support listing more than one language so
-# this cheats and claims to only be cpp.  If they add multiple language
-# support, this should probably get updated to install steps and/or
-# rvm/gemfile/jdk/etc. entries rather than manually doing the work.
+# everything is driven by the test.sh, so the language doesn't really
+# matter, it just controls the default install/script/etc. steps on
+# travis.
 language: cpp
-os:
-  - osx
-# The Objective C build needs Xcode 7.0 or later.
+os: osx
 osx_image: xcode8.3
 script:
   - ./tests.sh $CONFIG

From 2e17639133ced527400330b1126f713aedc96729 Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Wed, 15 Nov 2017 10:36:49 -0500
Subject: [PATCH 3/4] Remove the ruby tests from travis configs.

Looking at tarvis history for master, jruby doesn't look like it has passed
in a really long time.  The other two tests have been failing for a few weeks.
Since travis has limited osx hosts, seems better to just remove things we
aren't expecting to pass.
---
 .travis.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6c19d244a..269c2df66e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,6 @@ env:
   - CONFIG=objectivec_cocoapods_integration
   - CONFIG=python
   - CONFIG=python_cpp
-  - CONFIG=ruby21
-  - CONFIG=ruby22
-  - CONFIG=jruby
   - CONFIG=php5.6_mac
   - CONFIG=php7.0_mac
 matrix:
@@ -53,11 +50,6 @@ matrix:
     - os: linux
       env: CONFIG=python_compatibility
   allow_failures:
-    # These currently do not work on OS X but are being worked on by @haberman.
-    - os: osx
-      env: CONFIG=ruby22
-    - os: osx
-      env: CONFIG=jruby
     # https://github.com/google/protobuf/issues/1253 - Started failing when
     # we moved to an OS X image that is 10.11.
     - os: osx

From a839c67dfe6ea49ae86c75c7744e0fe3ec42f31e Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Wed, 15 Nov 2017 10:39:35 -0500
Subject: [PATCH 4/4] Remove the allowed_failure for python_cpp as the bug was
 fixed.

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 269c2df66e..44a7701b39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,10 +50,6 @@ matrix:
     - os: linux
       env: CONFIG=python_compatibility
   allow_failures:
-    # https://github.com/google/protobuf/issues/1253 - Started failing when
-    # we moved to an OS X image that is 10.11.
-    - os: osx
-      env: CONFIG=python_cpp
     # Mark the iOS test as flakey as xcodebuild some times fails to start the
     # iOS Simulator.
     - os: osx