Skip to content

Commit 4fe3307

Browse files
derekmaurocopybara-github
authored andcommitted
macOS CI: Move the Bazel vendor_dir to ${HOME} to workaround a Bazel issue
where it does not work when it is in ${TMP} and also fix the quoting which was causing it to incorrectly receive the argument bazelbuild/bazel#27156 PiperOrigin-RevId: 826083231 Change-Id: If8f069c42c62434893db27bdaae0b0e25b67839d
1 parent b2b9072 commit 4fe3307

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ci/macos-presubmit.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ fi
6666

6767
# Use Bazel Vendor mode to reduce reliance on external dependencies.
6868
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f "${KOKORO_GFILE_DIR}/distdir/googletest_vendor.tar.gz" ]]; then
69-
tar -xf "${KOKORO_GFILE_DIR}/distdir/googletest_vendor.tar.gz" -C "${TMP}/"
70-
BAZEL_EXTRA_ARGS="--vendor_dir=\"${TMP}/googletest_vendor\" ${BAZEL_EXTRA_ARGS:-}"
69+
tar -xf "${KOKORO_GFILE_DIR}/distdir/googletest_vendor.tar.gz" -C "${HOME}/"
70+
BAZEL_EXTRA_ARGS="--vendor_dir=${HOME}/googletest_vendor ${BAZEL_EXTRA_ARGS:-}"
7171
fi
7272

7373
cd ${GTEST_ROOT}

0 commit comments

Comments
 (0)