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 80edd6e2809340d2f6794cbbd095d519de11241b Author: Nicholas Nezis <[email protected]> AuthorDate: Fri Dec 23 17:15:55 2022 -0500 Upgrade Bazel to 6.0.0 --- .bazelversion | 2 +- .travis.yml | 2 +- README.md | 2 +- docker/compile/Dockerfile.centos7 | 2 +- docker/compile/Dockerfile.debian11 | 2 +- docker/compile/Dockerfile.rocky8 | 2 +- docker/compile/Dockerfile.ubuntu18.04 | 2 +- docker/compile/Dockerfile.ubuntu20.04 | 2 +- docker/compile/Dockerfile.ubuntu22.04 | 2 +- docker/test/Dockerfile.centos7 | 2 +- docker/test/Dockerfile.rocky8 | 2 +- docker/test/Dockerfile.ubuntu18.04 | 2 +- scripts/ci/setup_bazel.sh | 2 +- vagrant/init.sh | 2 +- website2/website/scripts/Dockerfile.ubuntu18.04 | 2 +- website2/website/scripts/replace.js | 3 ++- 16 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.bazelversion b/.bazelversion index af8c8ec7c13..09b254e90c6 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -4.2.2 +6.0.0 diff --git a/.travis.yml b/.travis.yml index a9190ad2c02..97d3d81d68e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ addons: - libgoogle-perftools-dev env: - - BAZEL_VERSION=4.2.2 ENABLE_HEAPCHECK=1 LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 + - BAZEL_VERSION=6.0.0 ENABLE_HEAPCHECK=1 LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 before_install: # download and install bazel diff --git a/README.md b/README.md index a3814dcaa6d..f50c231e695 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Confluence: https://cwiki.apache.org/confluence/display/HERON #### Heron Requirements: * Java 11 * Python 3.6 - * Bazel 4.2.2 + * Bazel 6.0.0 ## Contact diff --git a/docker/compile/Dockerfile.centos7 b/docker/compile/Dockerfile.centos7 index 183a19c2d77..d8a33a74202 100644 --- a/docker/compile/Dockerfile.centos7 +++ b/docker/compile/Dockerfile.centos7 @@ -49,7 +49,7 @@ RUN yum -y install \ ENV LC_ALL en_US.utf8 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk -ENV bazelVersion 4.2.2 +ENV bazelVersion 6.0.0 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 \ diff --git a/docker/compile/Dockerfile.debian11 b/docker/compile/Dockerfile.debian11 index d1a84e071e7..93e41a2e3b3 100644 --- a/docker/compile/Dockerfile.debian11 +++ b/docker/compile/Dockerfile.debian11 @@ -42,7 +42,7 @@ RUN apt-get update && apt-get -y install \ wget \ zip -ENV bazelVersion 4.2.2 +ENV bazelVersion 6.0.0 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 \ diff --git a/docker/compile/Dockerfile.rocky8 b/docker/compile/Dockerfile.rocky8 index 5a8f7c8450e..5b0495b383e 100644 --- a/docker/compile/Dockerfile.rocky8 +++ b/docker/compile/Dockerfile.rocky8 @@ -47,7 +47,7 @@ RUN update-alternatives --set python /usr/bin/python3.9 ENV LC_ALL en_US.utf8 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk -ENV bazelVersion 4.2.2 +ENV bazelVersion 6.0.0 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 \ diff --git a/docker/compile/Dockerfile.ubuntu18.04 b/docker/compile/Dockerfile.ubuntu18.04 index 72bde0343fc..4b67ae294bf 100644 --- a/docker/compile/Dockerfile.ubuntu18.04 +++ b/docker/compile/Dockerfile.ubuntu18.04 @@ -47,7 +47,7 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.8 10 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 -ENV bazelVersion 4.2.2 +ENV bazelVersion 6.0.0 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 \ diff --git a/docker/compile/Dockerfile.ubuntu20.04 b/docker/compile/Dockerfile.ubuntu20.04 index 98d401c39c8..027ac3d45e3 100644 --- a/docker/compile/Dockerfile.ubuntu20.04 +++ b/docker/compile/Dockerfile.ubuntu20.04 @@ -44,7 +44,7 @@ RUN apt-get update && apt-get -y install \ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 -ENV bazelVersion 4.2.2 +ENV bazelVersion 6.0.0 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 \ diff --git a/docker/compile/Dockerfile.ubuntu22.04 b/docker/compile/Dockerfile.ubuntu22.04 index 6a5ec9c1c48..3df9b8315c1 100644 --- a/docker/compile/Dockerfile.ubuntu22.04 +++ b/docker/compile/Dockerfile.ubuntu22.04 @@ -45,7 +45,7 @@ RUN apt-get update && apt-get -y install \ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 -ENV bazelVersion 4.2.2 +ENV bazelVersion 6.0.0 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 \ diff --git a/docker/test/Dockerfile.centos7 b/docker/test/Dockerfile.centos7 index a6ba1194b0f..c4c1008bbf6 100644 --- a/docker/test/Dockerfile.centos7 +++ b/docker/test/Dockerfile.centos7 @@ -51,7 +51,7 @@ RUN /usr/bin/ln -sfT /opt/rh/rh-python38/root/usr/bin/python3 /usr/bin/python3 \ ENV LC_ALL en_US.utf8 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk -ENV bazelVersion 4.2.2 +ENV bazelVersion 6.0.0 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 \ diff --git a/docker/test/Dockerfile.rocky8 b/docker/test/Dockerfile.rocky8 index 024f2f1fcc8..d5c68375d09 100644 --- a/docker/test/Dockerfile.rocky8 +++ b/docker/test/Dockerfile.rocky8 @@ -50,7 +50,7 @@ RUN update-alternatives --set python /usr/bin/python3.9 ENV LC_ALL en_US.utf8 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk -ENV bazelVersion 4.2.2 +ENV bazelVersion 6.0.0 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 \ diff --git a/docker/test/Dockerfile.ubuntu18.04 b/docker/test/Dockerfile.ubuntu18.04 index 0b4a714b23c..75b399564a5 100644 --- a/docker/test/Dockerfile.ubuntu18.04 +++ b/docker/test/Dockerfile.ubuntu18.04 @@ -41,7 +41,7 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 -ENV bazelVersion 4.2.2 +ENV bazelVersion 6.0.0 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 \ diff --git a/scripts/ci/setup_bazel.sh b/scripts/ci/setup_bazel.sh index 8927586f7b9..1c5b2df7eaf 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=4.2.2 +BAZEL_VERSION=6.0.0 # Install Bazel BAZEL_INSTALLER=bazel-$BAZEL_VERSION-installer-$BAZEL_OS-x86_64.sh diff --git a/vagrant/init.sh b/vagrant/init.sh index f9a44dc9ae0..6b10d18dd1b 100644 --- a/vagrant/init.sh +++ b/vagrant/init.sh @@ -16,7 +16,7 @@ set -o errexit -o nounset -o pipefail # See the License for the specific language governing permissions and # limitations under the License. -bazelVersion=4.2.2 +bazelVersion=6.0.0 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/website/scripts/Dockerfile.ubuntu18.04 b/website2/website/scripts/Dockerfile.ubuntu18.04 index 397f83fb42e..95640b25ae7 100644 --- a/website2/website/scripts/Dockerfile.ubuntu18.04 +++ b/website2/website/scripts/Dockerfile.ubuntu18.04 @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y nodejs ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 -ENV bazelVersion 4.2.2 +ENV bazelVersion 6.0.0 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 --user diff --git a/website2/website/scripts/replace.js b/website2/website/scripts/replace.js index 32cf049958b..5a73cb9f44d 100755 --- a/website2/website/scripts/replace.js +++ b/website2/website/scripts/replace.js @@ -40,7 +40,8 @@ const bazelVersions = { '0.20.2-incubating': '0.26.0', '0.20.3-incubating': '3.7.0', '0.20.4-incubating': '3.7.2', - 'latest': '4.2.2', + '0.20.5-incubating': '4.2.2', + 'latest': '6.0.0', } function replaceBazel(version) {
