Upgrade bazel to 0.15.0.
PiperOrigin-RevId: 205878953
This commit is contained in:
parent
3ca47448ad
commit
bb384118db
@ -18,7 +18,7 @@ closure_repositories()
|
|||||||
# files, in case the parsing of those build files depends on the bazel
|
# files, in case the parsing of those build files depends on the bazel
|
||||||
# version we require here.
|
# version we require here.
|
||||||
load("//tensorflow:version_check.bzl", "check_bazel_version_at_least")
|
load("//tensorflow:version_check.bzl", "check_bazel_version_at_least")
|
||||||
check_bazel_version_at_least("0.13.0")
|
check_bazel_version_at_least("0.15.0")
|
||||||
|
|
||||||
load("//tensorflow:workspace.bzl", "tf_workspace")
|
load("//tensorflow:workspace.bzl", "tf_workspace")
|
||||||
|
|
||||||
|
@ -1451,7 +1451,7 @@ def main():
|
|||||||
# environment variables.
|
# environment variables.
|
||||||
environ_cp = dict(os.environ)
|
environ_cp = dict(os.environ)
|
||||||
|
|
||||||
check_bazel_version('0.13.0')
|
check_bazel_version('0.15.0')
|
||||||
|
|
||||||
reset_tf_configure_bazelrc(args.workspace)
|
reset_tf_configure_bazelrc(args.workspace)
|
||||||
cleanup_makefile()
|
cleanup_makefile()
|
||||||
|
@ -354,7 +354,7 @@ do_external_licenses_check(){
|
|||||||
|
|
||||||
# Whitelist
|
# Whitelist
|
||||||
echo ${EXTRA_LICENSE_FILE}
|
echo ${EXTRA_LICENSE_FILE}
|
||||||
grep -e "@bazel_tools//src" -e "@bazel_tools//tools/" -e "@com_google_absl//" -e "//external" -e "@local" -e "@com_github_googlecloudplatform_google_cloud_cpp//" -v ${EXTRA_LICENSES_FILE} > temp.txt
|
grep -e "@bazel_tools//src" -e "@bazel_tools//tools/" -e "@com_google_absl//" -e "//external" -e "@local" -e "@com_github_googlecloudplatform_google_cloud_cpp//" -e "@embedded_jdk//" -v ${EXTRA_LICENSES_FILE} > temp.txt
|
||||||
mv temp.txt ${EXTRA_LICENSES_FILE}
|
mv temp.txt ${EXTRA_LICENSES_FILE}
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
# Select bazel version.
|
# Select bazel version.
|
||||||
BAZEL_VERSION="0.14.1"
|
BAZEL_VERSION="0.15.0"
|
||||||
|
|
||||||
set +e
|
set +e
|
||||||
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
|
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
# It will compile bazel from source and install it in /usr/local/bin
|
# It will compile bazel from source and install it in /usr/local/bin
|
||||||
|
|
||||||
# Select bazel version.
|
# Select bazel version.
|
||||||
BAZEL_VERSION="0.14.1"
|
BAZEL_VERSION="0.15.0"
|
||||||
|
|
||||||
set +e
|
set +e
|
||||||
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
|
local_bazel_ver=$(bazel version 2>&1 | grep -i label | awk '{print $3}')
|
||||||
|
@ -33,10 +33,10 @@ function set_remote_cache_options {
|
|||||||
echo "build --tls_enabled=true" >> "${TMP_BAZELRC}"
|
echo "build --tls_enabled=true" >> "${TMP_BAZELRC}"
|
||||||
echo "build --remote_timeout=3600" >> "${TMP_BAZELRC}"
|
echo "build --remote_timeout=3600" >> "${TMP_BAZELRC}"
|
||||||
echo "build --auth_enabled=true" >> "${TMP_BAZELRC}"
|
echo "build --auth_enabled=true" >> "${TMP_BAZELRC}"
|
||||||
echo "build --spawn_strategy=remote" >> "${TMP_BAZELRC}"
|
echo "build --spawn_strategy=standalone" >> "${TMP_BAZELRC}"
|
||||||
echo "build --strategy=Javac=remote" >> "${TMP_BAZELRC}"
|
echo "build --strategy=Javac=standalone" >> "${TMP_BAZELRC}"
|
||||||
echo "build --strategy=Closure=remote" >> "${TMP_BAZELRC}"
|
echo "build --strategy=Closure=standalone" >> "${TMP_BAZELRC}"
|
||||||
echo "build --genrule_strategy=remote" >> "${TMP_BAZELRC}"
|
echo "build --genrule_strategy=standalone" >> "${TMP_BAZELRC}"
|
||||||
echo "build --google_credentials=$GOOGLE_CLOUD_CREDENTIAL" >> "${TMP_BAZELRC}"
|
echo "build --google_credentials=$GOOGLE_CLOUD_CREDENTIAL" >> "${TMP_BAZELRC}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ RUN echo "startup --batch" >>/etc/bazel.bazelrc
|
|||||||
RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
|
RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
|
||||||
>>/etc/bazel.bazelrc
|
>>/etc/bazel.bazelrc
|
||||||
# Install the most recent bazel release.
|
# Install the most recent bazel release.
|
||||||
ENV BAZEL_VERSION 0.14.1
|
ENV BAZEL_VERSION 0.15.0
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
RUN mkdir /bazel && \
|
RUN mkdir /bazel && \
|
||||||
cd /bazel && \
|
cd /bazel && \
|
||||||
|
@ -79,7 +79,7 @@ RUN echo "startup --batch" >>/etc/bazel.bazelrc
|
|||||||
RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
|
RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
|
||||||
>>/etc/bazel.bazelrc
|
>>/etc/bazel.bazelrc
|
||||||
# Install the most recent bazel release.
|
# Install the most recent bazel release.
|
||||||
ENV BAZEL_VERSION 0.14.1
|
ENV BAZEL_VERSION 0.15.0
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
RUN mkdir /bazel && \
|
RUN mkdir /bazel && \
|
||||||
cd /bazel && \
|
cd /bazel && \
|
||||||
|
@ -4,7 +4,7 @@ LABEL maintainer="Gunhan Gulsoy <gunan@google.com>"
|
|||||||
|
|
||||||
# It is possible to override these for releases.
|
# It is possible to override these for releases.
|
||||||
ARG TF_BRANCH=master
|
ARG TF_BRANCH=master
|
||||||
ARG BAZEL_VERSION=0.5.4
|
ARG BAZEL_VERSION=0.15.0
|
||||||
ARG TF_AVAILABLE_CPUS=32
|
ARG TF_AVAILABLE_CPUS=32
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
Loading…
Reference in New Issue
Block a user