You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ni...@apache.org on 2020/04/08 03:59:24 UTC

[incubator-heron] branch nicknezis/bazel-2 updated: Updating to Bazel 3.0.0

This is an automated email from the ASF dual-hosted git repository.

nicknezis pushed a commit to branch nicknezis/bazel-2
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/nicknezis/bazel-2 by this push:
     new a704b96  Updating to Bazel 3.0.0
a704b96 is described below

commit a704b96cf1495a4a6d0d889556a98ca6eed44324
Author: Nicholas Nezis <ni...@gmail.com>
AuthorDate: Tue Apr 7 23:58:37 2020 -0400

    Updating to Bazel 3.0.0
---
 .travis.yml                                     | 2 +-
 README.md                                       | 2 +-
 docker/compile/Dockerfile.centos7               | 2 +-
 docker/compile/Dockerfile.debian10              | 2 +-
 docker/compile/Dockerfile.debian9               | 2 +-
 docker/compile/Dockerfile.ubuntu14.04           | 2 +-
 docker/compile/Dockerfile.ubuntu16.04           | 2 +-
 docker/compile/Dockerfile.ubuntu18.04           | 2 +-
 scripts/ci/setup_bazel.sh                       | 2 +-
 tools/travis/bazel.rc                           | 2 +-
 vagrant/init.sh                                 | 2 +-
 website2/website/scripts/Dockerfile.ubuntu18.04 | 2 +-
 website2/website/scripts/replace.js             | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 201a3a6..69bc9ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ addons:
       - libgoogle-perftools-dev
 
 env:
-  - BAZEL_VERSION=2.2.0 ENABLE_HEAPCHECK=1
+  - BAZEL_VERSION=3.0.0 ENABLE_HEAPCHECK=1
 
 before_install:
   # download and install bazel
diff --git a/README.md b/README.md
index 01b52b2..37e576b 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Heron is realtime analytics platform developed by Twitter.  It has a wide array
 #### Heron Requirements:
  * Java 11
  * Python 2.7
- * Bazel 2.0.0
+ * Bazel 3.0.0
 
 ## Contact
 
diff --git a/docker/compile/Dockerfile.centos7 b/docker/compile/Dockerfile.centos7
index 9d7debc..5e3bc49 100644
--- a/docker/compile/Dockerfile.centos7
+++ b/docker/compile/Dockerfile.centos7
@@ -19,7 +19,7 @@ FROM centos:centos7
 
 # This is passed to the heron build command via the --config flag
 ENV TARGET_PLATFORM centos
-ENV bazelVersion 2.0.0
+ENV bazelVersion 3.0.0
 
 RUN yum -y upgrade
 RUN yum -y install \
diff --git a/docker/compile/Dockerfile.debian10 b/docker/compile/Dockerfile.debian10
index 70e15d0..d50824c 100644
--- a/docker/compile/Dockerfile.debian10
+++ b/docker/compile/Dockerfile.debian10
@@ -19,7 +19,7 @@ FROM openjdk:11.0.6-slim-buster
 
 # This is passed to the heron build command via the --config flag
 ENV TARGET_PLATFORM debian
-ENV bazelVersion 0.26.0
+ENV bazelVersion 3.0.0
 
 RUN apt-get update && apt-get -y install \
       automake \
diff --git a/docker/compile/Dockerfile.debian9 b/docker/compile/Dockerfile.debian9
index 223c4eb..9572652 100644
--- a/docker/compile/Dockerfile.debian9
+++ b/docker/compile/Dockerfile.debian9
@@ -19,7 +19,7 @@ FROM openjdk:11-jdk-slim-stretch
 
 # This is passed to the heron build command via the --config flag
 ENV TARGET_PLATFORM debian
-ENV bazelVersion 0.26.0
+ENV bazelVersion 3.0.0
 
 RUN apt-get update && apt-get -y install \
       automake \
diff --git a/docker/compile/Dockerfile.ubuntu14.04 b/docker/compile/Dockerfile.ubuntu14.04
index 52d913d..8ba7bea 100644
--- a/docker/compile/Dockerfile.ubuntu14.04
+++ b/docker/compile/Dockerfile.ubuntu14.04
@@ -19,7 +19,7 @@ FROM ubuntu:14.04
 
 # This is passed to the heron build command via the --config flag
 ENV TARGET_PLATFORM ubuntu
-ENV bazelVersion 2.0.0
+ENV bazelVersion 3.0.0
 
 RUN apt-get update && apt-get install -y software-properties-common
 
diff --git a/docker/compile/Dockerfile.ubuntu16.04 b/docker/compile/Dockerfile.ubuntu16.04
index fc7ce78..0befaae 100644
--- a/docker/compile/Dockerfile.ubuntu16.04
+++ b/docker/compile/Dockerfile.ubuntu16.04
@@ -19,7 +19,7 @@ FROM ubuntu:16.04
 
 # This is passed to the heron build command via the --config flag
 ENV TARGET_PLATFORM ubuntu
-ENV bazelVersion 2.0.0
+ENV bazelVersion 3.0.0
 
 RUN apt-get update && apt-get -y install \
       automake \
diff --git a/docker/compile/Dockerfile.ubuntu18.04 b/docker/compile/Dockerfile.ubuntu18.04
index c55a069..2f115cf 100644
--- a/docker/compile/Dockerfile.ubuntu18.04
+++ b/docker/compile/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 0.26.0
+ENV bazelVersion 3.0.0
 
 RUN apt-get update && apt-get -y install \
       g++ \
diff --git a/scripts/ci/setup_bazel.sh b/scripts/ci/setup_bazel.sh
index 1960143..95077ee 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=2.0.0
+BAZEL_VERSION=3.0.0
 
 # Install Bazel
 BAZEL_INSTALLER=bazel-$BAZEL_VERSION-installer-$BAZEL_OS-x86_64.sh
diff --git a/tools/travis/bazel.rc b/tools/travis/bazel.rc
index 555376b..1aa81bd 100644
--- a/tools/travis/bazel.rc
+++ b/tools/travis/bazel.rc
@@ -19,7 +19,7 @@
 startup --host_jvm_args=-Xmx2500m
 startup --host_jvm_args=-Xms2500m
 startup --batch
-test --ram_utilization_factor=10
+test --local_ram_resources=HOST_RAM*0.20
 test --test_output=errors
 
 # This is so we understand failures better
diff --git a/vagrant/init.sh b/vagrant/init.sh
index 91c02e3..c5186b2 100644
--- a/vagrant/init.sh
+++ b/vagrant/init.sh
@@ -55,7 +55,7 @@ install_jdk8() {
     apt-get -y install oracle-java8-installer oracle-java8-set-default vim wget screen git    
 }
 
-bazelVersion=2.0.0
+bazelVersion=3.0.0
 bazel_install() {
     install_jdk8
     apt-get install -y g++ automake cmake gcc-4.8 g++-4.8 zlib1g-dev zip pkg-config wget libssl-dev
diff --git a/website2/website/scripts/Dockerfile.ubuntu18.04 b/website2/website/scripts/Dockerfile.ubuntu18.04
index 98a24ef..c250a73 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 2.0.0
+ENV bazelVersion 3.0.0
 
 
 RUN apt-get update && apt-get -y install \
diff --git a/website2/website/scripts/replace.js b/website2/website/scripts/replace.js
index 691e613..1c58625 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': '2.0.0',
+    'latest': '3.0.0',
 }
 
 function replaceBazel(version) {