diff options
author | dmauro <dmauro@google.com> | 2020-11-30 21:55:34 (GMT) |
---|---|---|
committer | vslashg <gfalcon@google.com> | 2020-12-02 23:23:22 (GMT) |
commit | d73706911133b38d8d855b9dbb6dec6b5134884f (patch) | |
tree | 1b0c2287e08683773ad35854febd8b6f62fa923b /ci | |
parent | 1544828d276c0a4652406090c0aa26de3f6eef47 (diff) | |
download | googletest-d73706911133b38d8d855b9dbb6dec6b5134884f.zip googletest-d73706911133b38d8d855b9dbb6dec6b5134884f.tar.gz googletest-d73706911133b38d8d855b9dbb6dec6b5134884f.tar.bz2 |
Googletest export
Fix the TravisCI build by updating the required tools
PiperOrigin-RevId: 344882646
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/env-osx.sh | 16 | ||||
-rwxr-xr-x | ci/install-osx.sh | 3 | ||||
-rwxr-xr-x | ci/log-config.sh | 4 |
3 files changed, 6 insertions, 17 deletions
diff --git a/ci/env-osx.sh b/ci/env-osx.sh index 9c421e1..fd4239f 100755 --- a/ci/env-osx.sh +++ b/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 - 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 +if [ "${TRAVIS_OS_NAME}" != "osx" ]; then + echo "Not a macOS build; skipping" + exit 0 fi + +# This file is currently intentionally empty. diff --git a/ci/install-osx.sh b/ci/install-osx.sh index cc47508..c81c33c 100755 --- a/ci/install-osx.sh +++ b/ci/install-osx.sh @@ -36,5 +36,4 @@ if [ "${TRAVIS_OS_NAME}" != "osx" ]; then exit 0 fi -brew update -brew install ccache gcc@4.9 +# This file is currently intentionally empty. diff --git a/ci/log-config.sh b/ci/log-config.sh index 5fef119..c76c49a 100755 --- a/ci/log-config.sh +++ b/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:" |