diff options
| author |  Abseil Team <absl-team@google.com> | 2022-02-01 13:52:49 -0800 |
|---|---|---|
| committer |  Derek Mauro <dmauro@google.com> | 2022-02-01 16:55:00 -0500 |
| commit | 5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 (patch) | |
| tree | 7438f1d65ecaea8f5796abe167625d739da9c3d2 /ci | |
| parent | 63d26fad49463561c2427a45aab283938ade10d9 (diff) | |
Export of internal Abseil changes
--
121db1a08321eaa3006726cc32b459cf17880e35 by Derek Mauro <dmauro@google.com>:
Internal change
PiperOrigin-RevId: 425707805
--
0dec484389bbb75aae0a412146e3564bf833a739 by Derek Mauro <dmauro@google.com>:
macOS CI: Avoid depending on external sites like GitHub by prepopulating
dependencies and setting --distdir
Our Linux CI does this, but for some reason was never enabled on macOS
PiperOrigin-RevId: 425668638
GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35
Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/macos_xcode_bazel.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ci/macos_xcode_bazel.sh b/ci/macos_xcode_bazel.sh index 93fb03cd..1e29311f 100755 --- a/ci/macos_xcode_bazel.sh +++ b/ci/macos_xcode_bazel.sh @@ -32,6 +32,13 @@ else BAZEL_BIN="bazel" fi +# Avoid depending on external sites like GitHub by checking --distdir for +# external dependencies first. +# https://docs.bazel.build/versions/master/guide.html#distdir +if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -d "${KOKORO_GFILE_DIR}/distdir" ]]; then + BAZEL_EXTRA_ARGS="--distdir=${KOKORO_GFILE_DIR}/distdir ${BAZEL_EXTRA_ARGS:-}" +fi + # Print the compiler and Bazel versions. echo "---------------" gcc -v @@ -52,4 +59,5 @@ ${BAZEL_BIN} test ... \ --show_timestamps \ --test_env="TZDIR=${ABSEIL_ROOT}/absl/time/internal/cctz/testdata/zoneinfo" \ --test_output=errors \ - --test_tag_filters=-benchmark + --test_tag_filters=-benchmark \ + ${BAZEL_EXTRA_ARGS:-} |