From 6db0bbeb6e959dc4a401f7be17ce2fb79e164a5e Mon Sep 17 00:00:00 2001 From: Google APIs Date: Fri, 21 Aug 2020 00:59:02 -0700 Subject: [PATCH] Add support for the Bazelisk launcher. PiperOrigin-RevId: 327771486 --- .kokoro/build.sh | 4 ++-- .kokoro/setup.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index fe41332f..9de38b10 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -11,5 +11,5 @@ source .kokoro/setup.sh # # Run build and tests # -${BAZEL} --output_user_root=${BAZEL_ROOT} build --keep_going //... -${BAZEL} --output_user_root=${BAZEL_ROOT} test --flaky_test_attempts=3 --keep_going //... +${BAZELISK_BIN} --output_user_root=${BAZEL_ROOT} build --keep_going //... +${BAZELISK_BIN} --output_user_root=${BAZEL_ROOT} test --flaky_test_attempts=3 --keep_going //... diff --git a/.kokoro/setup.sh b/.kokoro/setup.sh index 26607b4f..25d0b07e 100644 --- a/.kokoro/setup.sh +++ b/.kokoro/setup.sh @@ -3,17 +3,17 @@ set -e # -# Install bazel +# Install bazelisk # mkdir ${KOKORO_ROOT}/tools cd ${KOKORO_ROOT}/tools -curl -L https://github.com/bazelbuild/bazel/releases/download/3.0.0/bazel-3.0.0-linux-x86_64 -o bazel -chmod +x bazel +curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.6.1/bazelisk-linux-amd64 -o bazelisk +chmod +x bazelisk mkdir bazel_root cd - # gapic-generator-python requires python 3.6+ pyenv global 3.6.1 -BAZEL=${KOKORO_ROOT}/tools/bazel +BAZELISK_BIN=${KOKORO_ROOT}/tools/bazelisk BAZEL_ROOT=${KOKORO_ROOT}/tools/bazel_root