update scripts

pull/19249/head
Jan Tattermusch 6 years ago
parent a64ddff19c
commit ed7e8c53e0
  1. 2
      templates/tools/dockerfile/bazel.include
  2. 2
      tools/dockerfile/test/bazel/Dockerfile
  3. 2
      tools/dockerfile/test/sanity/Dockerfile
  4. 4
      tools/internal_ci/linux/grpc_bazel_on_foundry_base.sh
  5. 2
      tools/internal_ci/windows/bazel_rbe.bat

@ -1,7 +1,7 @@
#========================
# Bazel installation
# Must be in sync with tools/bazel.sh
# Must be in sync with tools/bazel
ENV BAZEL_VERSION 0.24.1
RUN apt-get update && apt-get install -y wget && apt-get clean

@ -51,7 +51,7 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t
#========================
# Bazel installation
# Must be in sync with tools/bazel.sh
# Must be in sync with tools/bazel
ENV BAZEL_VERSION 0.24.1
RUN apt-get update && apt-get install -y wget && apt-get clean

@ -97,7 +97,7 @@ ENV CLANG_TIDY=clang-tidy
#========================
# Bazel installation
# Must be in sync with tools/bazel.sh
# Must be in sync with tools/bazel
ENV BAZEL_VERSION 0.24.1
RUN apt-get update && apt-get install -y wget && apt-get clean

@ -21,7 +21,7 @@ cd $(dirname $0)/../../..
source tools/internal_ci/helper_scripts/prepare_build_linux_rc
# make sure bazel is available
tools/bazel.sh version
tools/bazel version
# to get "bazel" link for kokoro build, we need to generate
# invocation UUID, set a flag for bazel to use it
@ -29,7 +29,7 @@ tools/bazel.sh version
BAZEL_INVOCATION_ID="$(uuidgen)"
echo "${BAZEL_INVOCATION_ID}" >"${KOKORO_ARTIFACTS_DIR}/bazel_invocation_ids"
tools/bazel.sh \
tools/bazel \
--bazelrc=tools/remote_build/kokoro.bazelrc \
test \
--invocation_id="${BAZEL_INVOCATION_ID}" \

@ -13,7 +13,7 @@
@rem limitations under the License.
@rem TODO(jtattermusch): make this generate less output
@rem TODO(jtattermusch): use tools/bazel.sh script to keep the versions in sync
@rem TODO(jtattermusch): use tools/bazel script to keep the versions in sync
choco install bazel -y --version 0.24.1 --limit-output
cd github/grpc

Loading…
Cancel
Save