This is an automated email from the ASF dual-hosted git repository. nicknezis pushed a commit to branch nicknezis/bazel-upgrade in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit d2c0b32e82afbefc13c2ba643d0a7b522c180955 Author: Nicholas Nezis <[email protected]> AuthorDate: Sun Jul 19 17:20:25 2020 -0400 Upgrade to Bazel 3.4.1 --- .travis.yml | 2 +- README.md | 2 +- docker/compile/Dockerfile.centos7 | 3 ++- docker/compile/Dockerfile.debian10 | 3 ++- docker/compile/Dockerfile.debian9 | 3 ++- docker/compile/Dockerfile.ubuntu14.04 | 3 ++- docker/compile/Dockerfile.ubuntu16.04 | 3 ++- docker/compile/Dockerfile.ubuntu18.04 | 3 ++- docker/compile/Dockerfile.ubuntu20.04 | 3 ++- docker/test/Dockerfile.centos7 | 3 ++- docker/test/Dockerfile.ubuntu18.04 | 3 ++- scripts/ci/setup_bazel.sh | 2 +- vagrant/init.sh | 2 +- website2/docs/compiling-osx.md | 2 +- website2/website/scripts/Dockerfile.ubuntu18.04 | 2 +- website2/website/scripts/replace.js | 2 +- 16 files changed, 25 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index caa4046..d9c05f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ addons: - libgoogle-perftools-dev env: - - BAZEL_VERSION=3.0.0 ENABLE_HEAPCHECK=1 + - BAZEL_VERSION=3.4.1 ENABLE_HEAPCHECK=1 before_install: # download and install bazel diff --git a/README.md b/README.md index 77f949d..6aff337 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Confluence: https://cwiki.apache.org/confluence/display/HERON #### Heron Requirements: * Java 11 * Python 3.6 - * Bazel 3.0.0 + * Bazel 3.4.1 ## Contact diff --git a/docker/compile/Dockerfile.centos7 b/docker/compile/Dockerfile.centos7 index 66c9dbe..02f74ae 100644 --- a/docker/compile/Dockerfile.centos7 +++ b/docker/compile/Dockerfile.centos7 @@ -19,7 +19,6 @@ FROM centos:centos7 # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM centos -ENV bazelVersion 3.0.0 RUN yum -y upgrade RUN yum -y install \ @@ -49,6 +48,8 @@ RUN yum -y install \ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk +ENV bazelVersion 3.4.1 + RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \ && /tmp/bazel.sh diff --git a/docker/compile/Dockerfile.debian10 b/docker/compile/Dockerfile.debian10 index 57cabcb..f1f9649 100644 --- a/docker/compile/Dockerfile.debian10 +++ b/docker/compile/Dockerfile.debian10 @@ -19,7 +19,6 @@ FROM openjdk:11.0.6-jdk-buster # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM debian -ENV bazelVersion 3.0.0 RUN apt-get update && apt-get -y install \ ant \ @@ -43,6 +42,8 @@ RUN apt-get update && apt-get -y install \ wget \ zip +ENV bazelVersion 3.4.1 + RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \ && /tmp/bazel.sh diff --git a/docker/compile/Dockerfile.debian9 b/docker/compile/Dockerfile.debian9 index 4d727d0..7c64975 100644 --- a/docker/compile/Dockerfile.debian9 +++ b/docker/compile/Dockerfile.debian9 @@ -19,7 +19,6 @@ FROM openjdk:11-jdk-stretch # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM debian -ENV bazelVersion 3.0.0 RUN apt-get update && apt-get -y install \ ant \ @@ -42,6 +41,8 @@ RUN apt-get update && apt-get -y install \ wget \ zip +ENV bazelVersion 3.4.1 + RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \ && /tmp/bazel.sh diff --git a/docker/compile/Dockerfile.ubuntu14.04 b/docker/compile/Dockerfile.ubuntu14.04 index f640816..6ad88b8 100644 --- a/docker/compile/Dockerfile.ubuntu14.04 +++ b/docker/compile/Dockerfile.ubuntu14.04 @@ -19,7 +19,6 @@ FROM ubuntu:14.04 # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM ubuntu -ENV bazelVersion 3.0.0 RUN apt-get update && apt-get install -y software-properties-common @@ -48,6 +47,8 @@ RUN apt-get update && apt-get -y install \ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 +ENV bazelVersion 3.4.1 + RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \ && /tmp/bazel.sh diff --git a/docker/compile/Dockerfile.ubuntu16.04 b/docker/compile/Dockerfile.ubuntu16.04 index 39ad02b..ee5c3dd 100644 --- a/docker/compile/Dockerfile.ubuntu16.04 +++ b/docker/compile/Dockerfile.ubuntu16.04 @@ -19,7 +19,6 @@ FROM ubuntu:16.04 # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM ubuntu -ENV bazelVersion 3.0.0 RUN apt-get update && apt-get install -y software-properties-common @@ -50,6 +49,8 @@ RUN apt-get update && apt-get -y install \ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 +ENV bazelVersion 3.4.1 + RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \ && /tmp/bazel.sh diff --git a/docker/compile/Dockerfile.ubuntu18.04 b/docker/compile/Dockerfile.ubuntu18.04 index a15848b..ba164fd 100644 --- a/docker/compile/Dockerfile.ubuntu18.04 +++ b/docker/compile/Dockerfile.ubuntu18.04 @@ -19,7 +19,6 @@ FROM ubuntu:18.04 # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM ubuntu -ENV bazelVersion 3.0.0 RUN apt-get update && apt-get -y install \ ant \ @@ -44,6 +43,8 @@ RUN apt-get update && apt-get -y install \ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 +ENV bazelVersion 3.4.1 + RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \ && /tmp/bazel.sh diff --git a/docker/compile/Dockerfile.ubuntu20.04 b/docker/compile/Dockerfile.ubuntu20.04 index e5a0cd4..e4662cd 100644 --- a/docker/compile/Dockerfile.ubuntu20.04 +++ b/docker/compile/Dockerfile.ubuntu20.04 @@ -19,7 +19,6 @@ FROM ubuntu:20.04 # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM ubuntu -ENV bazelVersion 3.0.0 ARG DEBIAN_FRONTEND=noninteractive @@ -46,6 +45,8 @@ RUN apt-get update && apt-get -y install \ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 +ENV bazelVersion 3.4.1 + RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \ && /tmp/bazel.sh diff --git a/docker/test/Dockerfile.centos7 b/docker/test/Dockerfile.centos7 index d2ad420..376f591 100644 --- a/docker/test/Dockerfile.centos7 +++ b/docker/test/Dockerfile.centos7 @@ -19,7 +19,6 @@ FROM centos:centos7 # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM centos -ENV bazelVersion 3.0.0 RUN yum -y upgrade RUN yum -y install \ @@ -48,6 +47,8 @@ RUN yum -y install \ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk +ENV bazelVersion 3.4.1 + RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \ && /tmp/bazel.sh diff --git a/docker/test/Dockerfile.ubuntu18.04 b/docker/test/Dockerfile.ubuntu18.04 index a62a77a..1e8d504 100644 --- a/docker/test/Dockerfile.ubuntu18.04 +++ b/docker/test/Dockerfile.ubuntu18.04 @@ -19,7 +19,6 @@ FROM ubuntu:18.04 # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM ubuntu -ENV bazelVersion 3.0.0 RUN apt-get update && apt-get -y install \ g++ \ @@ -41,6 +40,8 @@ RUN apt-get update && apt-get -y install \ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 +ENV bazelVersion 3.4.1 + RUN wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh \ && chmod +x /tmp/bazel.sh \ && /tmp/bazel.sh diff --git a/scripts/ci/setup_bazel.sh b/scripts/ci/setup_bazel.sh index 95077ee..2b41426 100644 --- a/scripts/ci/setup_bazel.sh +++ b/scripts/ci/setup_bazel.sh @@ -29,7 +29,7 @@ if [ "$#" -ne 1 ]; then exit 1 fi BAZEL_OS=$1 -BAZEL_VERSION=3.0.0 +BAZEL_VERSION=3.4.1 # Install Bazel BAZEL_INSTALLER=bazel-$BAZEL_VERSION-installer-$BAZEL_OS-x86_64.sh diff --git a/vagrant/init.sh b/vagrant/init.sh index bb764b3..5b793bb 100644 --- a/vagrant/init.sh +++ b/vagrant/init.sh @@ -43,7 +43,7 @@ install_marathon() { service marathon start } -bazelVersion=3.0.0 +bazelVersion=3.4.1 bazel_install() { apt-get install -y automake cmake gcc g++ zlib1g-dev zip pkg-config wget libssl-dev libunwind-dev mkdir -p /opt/bazel diff --git a/website2/docs/compiling-osx.md b/website2/docs/compiling-osx.md index 3750a09..24bb9c2 100644 --- a/website2/docs/compiling-osx.md +++ b/website2/docs/compiling-osx.md @@ -34,7 +34,7 @@ $ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/inst ### Step 2 -- Install Bazel ```bash -wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/3.0.0/bazel-3.0.0-installer-darwin-x86_64.sh +wget -O /tmp/bazel.sh https://github.com/bazelbuild/bazel/releases/download/3.4.1/bazel-3.4.1-installer-darwin-x86_64.sh chmod +x /tmp/bazel.sh /tmp/bazel.sh --user ``` diff --git a/website2/website/scripts/Dockerfile.ubuntu18.04 b/website2/website/scripts/Dockerfile.ubuntu18.04 index f247083..7d23b4b 100644 --- a/website2/website/scripts/Dockerfile.ubuntu18.04 +++ b/website2/website/scripts/Dockerfile.ubuntu18.04 @@ -19,7 +19,7 @@ FROM ubuntu:18.04 # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM ubuntu -ENV bazelVersion 3.0.0 +ENV bazelVersion 3.4.1 RUN apt-get update && apt-get -y install \ diff --git a/website2/website/scripts/replace.js b/website2/website/scripts/replace.js index 1c58625..b193329 100755 --- a/website2/website/scripts/replace.js +++ b/website2/website/scripts/replace.js @@ -38,7 +38,7 @@ const bazelVersions = { '0.20.0-incubating': '0.14.1', '0.20.1-incubating': '0.26.0', '0.20.2-incubating': '0.26.0', - 'latest': '3.0.0', + 'latest': '3.4.1', } function replaceBazel(version) {
