diff options
| author | Abseil Team <absl-team@google.com> | 2019-08-09T18·54-0700 |
|---|---|---|
| committer | vslashg <gfalcon@google.com> | 2019-08-09T19·11-0400 |
| commit | 4ef574064e75b86f115549e9eb4c7e806781b3ab (patch) | |
| tree | bcd527aff8b7d1f2cf673646e542ad739b8aaba7 /ci/macos_xcode_bazel.sh | |
| parent | 9ee91d3e430fb33a4590486573792eb0fa146c2d (diff) | |
Export of internal Abseil changes
-- 3dbb096e4662311f81df1017a8e0975e903936cf by Derek Mauro <dmauro@google.com>: Document and workaround a known MSVC bug doing constexpr pointer arithmetic PiperOrigin-RevId: 262604652 -- b5fa7f1a0c776f6ba20d52772a1679ec42ad21fd by Derek Mauro <dmauro@google.com>: Fix typo in macos_xcode_bazel.sh PiperOrigin-RevId: 262591285 -- 89dd77ab5bb44d76b6cb6b2f288e21536e16a85a by Derek Mauro <dmauro@google.com>: Internal change PiperOrigin-RevId: 262582747 -- 32295ed9a0c6c8ab143a912194040eede05d3ea3 by Abseil Team <absl-team@google.com>: Internal change PiperOrigin-RevId: 262569140 -- 7f0f5b94197369228024529022d727439d2c894f by Abseil Team <absl-team@google.com>: Internal change PiperOrigin-RevId: 262563554 -- 314aed043639abbd221074125c57b7c68616de7e by Derek Mauro <dmauro@google.com>: Release absl::btree PiperOrigin-RevId: 262553526 -- 72b44056c6ce9000c4a6cd9aec58b82067c82a13 by CJ Johnson <johnsoncj@google.com>: Internal change PiperOrigin-RevId: 262421185 -- 4e2c12151edf534f929e8e810f1334073f90489a by Abseil Team <absl-team@google.com>: Update documentation to make it less likely for users to write `Hours(24)` without considering using civil dates instead. PiperOrigin-RevId: 262420758 -- 92b85b9573e800bd96b019408eefbc5ce4f68780 by Derek Mauro <dmauro@google.com>: Add the ability to override the bazel version in the macos_xcode_bazel.sh test script. PiperOrigin-RevId: 262412063 GitOrigin-RevId: 3dbb096e4662311f81df1017a8e0975e903936cf Change-Id: I423b2b829dc0c5f814e37bec4d68c7470f43f041
Diffstat (limited to 'ci/macos_xcode_bazel.sh')
| -rwxr-xr-x | ci/macos_xcode_bazel.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ci/macos_xcode_bazel.sh b/ci/macos_xcode_bazel.sh index f0f142801dee..3e13b1538c74 100755 --- a/ci/macos_xcode_bazel.sh +++ b/ci/macos_xcode_bazel.sh @@ -23,16 +23,25 @@ if [ -z ${ABSEIL_ROOT:-} ]; then ABSEIL_ROOT="$(realpath $(dirname ${0})/..)" fi -# Print the default compiler and Bazel versions. +# If we are running on Kokoro, check for a versioned Bazel binary. +KOKORO_GFILE_BAZEL_BIN="bazel-0.28.1-darwin-x86_64" +if [ ${KOKORO_GFILE_DIR:-} ] && [ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]; then + BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}" + chmod +x ${BAZEL_BIN} +else + BAZEL_BIN="bazel" +fi + +# Print the compiler and Bazel versions. echo "---------------" gcc -v echo "---------------" -bazel version +${BAZEL_BIN} version echo "---------------" cd ${ABSEIL_ROOT} -bazel test ... \ +${BAZEL_BIN} test ... \ --copt=-Werror \ --keep_going \ --show_timestamps \ |