Googletest export

Fix the TravisCI build by updating the required tools

PiperOrigin-RevId: 344882646

.travis.yml

@@ -26,17 +26,19 @@ matrix:
     - os: linux
       dist: bionic
       compiler: gcc
-      env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated"
+      env: BUILD_TYPE=Debug CXX_FLAGS="-std=c++11 -Wdeprecated"
     - os: linux
       dist: bionic
       compiler: clang
-      env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON
+      env: BUILD_TYPE=Release CXX_FLAGS="-std=c++11 -Wdeprecated" NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON
     - os: osx
+      osx_image: xcode12.2
       compiler: gcc
-      env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp
+      env: BUILD_TYPE=Release CC=gcc-10 CXX=g++-10 CXX_FLAGS="-std=c++11 -Wdeprecated" HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp
     - os: osx
+      osx_image: xcode12.2
       compiler: clang
-      env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp
+      env: BUILD_TYPE=Release CXX_FLAGS="-std=c++11 -Wdeprecated" HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp
 
 # These are the install and build (script) phases for the most common entries in the matrix.  They could be included
 # in each entry in the matrix, but that is just repetitive.
@@ -56,9 +58,7 @@ addons:
     update: true
   homebrew:
     packages:
-    - ccache
+    - gcc@10
-    - gcc@4.9
-    - llvm@4
     update: true
 
 notifications:

ci/env-osx.sh

@@ -33,15 +33,9 @@
 # This file should be sourced, and not executed as a standalone script.
 #
 
-# TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}.
+if [ "${TRAVIS_OS_NAME}" != "osx" ]; then
-#
+   echo "Not a macOS build; skipping"
-
+   exit 0
-if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
-    if [ "$CXX" = "clang++" ]; then
-        # $PATH needs to be adjusted because the llvm tap doesn't install the
-        # package to /usr/local/bin, etc, like the gcc tap does.
-        # See: https://github.com/Homebrew/legacy-homebrew/issues/29733
-        clang_version=3.9
-        export PATH="/usr/local/opt/llvm@${clang_version}/bin:$PATH";
-    fi
 fi
+
+# This file is currently intentionally empty.

ci/install-osx.sh

@@ -36,5 +36,4 @@ if [ "${TRAVIS_OS_NAME}" != "osx" ]; then
     exit 0
 fi
 
-brew update
+# This file is currently intentionally empty.
-brew install ccache gcc@4.9

ci/log-config.sh

@@ -31,10 +31,6 @@
 
 set -e
 
-# ccache on OS X needs installation first
-# reset ccache statistics
-ccache --zero-stats
-
 echo PATH=${PATH}
 
 echo "Compiler configuration:"