Skip to content

Commit 2e7cd17

Browse files
authored
Upgrade to Bazel 3.0.0 (#128)
1 parent 081a6f0 commit 2e7cd17

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.bazelrc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ build:rbe --bes_results_url="https://source.cloud.google.com/results/invocations
1111
build:rbe --host_platform=//:rbe-ubuntu1604-network-standard
1212
build:rbe --platforms=//:rbe-ubuntu1604-network-standard
1313
build:rbe --extra_execution_platforms=//:rbe-ubuntu1604-network-standard
14-
build:rbe --host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/10.0.0/bazel_0.29.1/java:jdk
15-
build:rbe --javabase=@bazel_toolchains//configs/ubuntu16_04_clang/10.0.0/bazel_0.29.1/java:jdk
14+
build:rbe --host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.0.0/java:jdk
15+
build:rbe --javabase=@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.0.0/java:jdk
1616
build:rbe --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
1717
build:rbe --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
18-
build:rbe --extra_toolchains=@bazel_toolchains//configs/ubuntu16_04_clang/10.0.0/bazel_0.29.1/config:cc-toolchain
19-
build:rbe --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/10.0.0/bazel_0.29.1/cc:toolchain
18+
build:rbe --extra_toolchains=@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.0.0/config:cc-toolchain
19+
build:rbe --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.0.0/cc:toolchain
2020
build:rbe --jobs=50
2121
build:rbe --remote_timeout=3600
2222
build:rbe --bes_timeout=60s

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.29.0
1+
3.0.0

BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ exports_files(["deployment.properties"], visibility = ["//visibility:public"])
2323
# but with an additional setting dockerNetwork = standard because our tests need network access
2424
platform(
2525
name = "rbe-ubuntu1604-network-standard",
26-
parents = ["@bazel_toolchains//configs/ubuntu16_04_clang/10.0.0/bazel_0.29.1/config:platform"],
26+
parents = ["@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.0.0/config:platform"],
2727
remote_execution_properties = """
2828
properties: {
2929
name: "container-image"

bazel/dependencies.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ def bazel_common():
2929
def bazel_toolchain():
3030
http_archive(
3131
name = "bazel_toolchains",
32-
sha256 = "a1e273b6159ae858f53046f5bab9678cffa82a72f0bf0c0a9e4af8fddb91209c",
33-
strip_prefix = "bazel-toolchains-0.29.6",
32+
sha256 = "239a1a673861eabf988e9804f45da3b94da28d1aff05c373b013193c315d9d9e",
33+
strip_prefix = "bazel-toolchains-3.0.1",
3434
urls = [
35-
"https://github.com/bazelbuild/bazel-toolchains/releases/download/0.29.6/bazel-toolchains-0.29.6.tar.gz",
35+
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.0.1/bazel-toolchains-3.0.1.tar.gz",
3636
],
3737
)
3838

ci/install-bazel-linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
set -e
4-
BAZEL_VERSION=0.29.1
4+
BAZEL_VERSION=3.0.0
55

66
curl -OL https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
77
chmod +x bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh

ci/install-bazel-mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
set -e
4-
BAZEL_VERSION=0.29.1
4+
BAZEL_VERSION=3.0.0
55

66
brew cask install homebrew/cask-versions/adoptopenjdk8
77
curl -OL https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh

0 commit comments

Comments
 (0)