Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.

Commit ff423d8

Browse files
authored
Bazel 3.2 and 3.3 compatibility (#287)
1 parent 2503b72 commit ff423d8

File tree

4 files changed

+21
-23
lines changed

4 files changed

+21
-23
lines changed

.bazelrc

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
common --config=rules
2-
common:v3.1 --config=rules_v3.1
32
import %workspace%/.bazelrc_shared

.bazelrc_shared

+4-5
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@ test --test_output=all
1414
build:rules --disk_cache=.bazel_cache
1515
build:tests --disk_cache=../.bazel_cache
1616

17-
# bazel 3.1.0
18-
common:rules_v3.0 --config=noop
19-
common:rules_v3.1 --config=noop
17+
common:rules_v3.2 --config=noop
18+
common:rules_v3.3 --config=noop
2019

2120
# route potentially unrouted configs to a terminating noop config
2221
# it's a noop because we use the default value
2322
common:rules --config=noop
2423
common:tests --config=noop
25-
common:v3.0 --config=rules_v3.0
26-
common:v3.1 --config=rules_v3.1
24+
common:v3.2 --config=rules_v3.2
25+
common:v3.3 --config=rules_v3.3
2726

2827
# pick something trivial as a "noop"
2928
common:noop --logging=3

.travis.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -28,36 +28,36 @@ jobs:
2828
# Build
2929
- stage: build
3030
<<: *osx
31-
env: BAZEL_VERSION=3.0.0
31+
env: BAZEL_VERSION=3.2.0
3232
script: ./scripts/travis.sh build
3333
- <<: *linux
34-
env: BAZEL_VERSION=3.0.0
34+
env: BAZEL_VERSION=3.2.0
3535
script: ./scripts/travis.sh build
3636
- <<: *osx
37-
env: BAZEL_VERSION=3.1.0
37+
env: BAZEL_VERSION=3.3.0
3838
script: ./scripts/travis.sh build
3939
- <<: *linux
40-
env: BAZEL_VERSION=3.1.0
40+
env: BAZEL_VERSION=3.3.0
4141
script: ./scripts/travis.sh build
4242
# Lint
4343
- stage: lint
4444
<<: *osx
45-
env: BAZEL_VERSION=3.0.0
45+
env: BAZEL_VERSION=3.2.0
4646
script: ./scripts/travis.sh lint
4747
- <<: *linux
48-
env: BAZEL_VERSION=3.1.0
48+
env: BAZEL_VERSION=3.3.0
4949
script: ./scripts/travis.sh lint
5050
# Test
5151
- stage: test
5252
<<: *osx
53-
env: BAZEL_VERSION=3.0.0
53+
env: BAZEL_VERSION=3.2.0
5454
script: ./scripts/travis.sh test
5555
- <<: *linux
56-
env: BAZEL_VERSION=3.0.0
56+
env: BAZEL_VERSION=3.2.0
5757
script: ./scripts/travis.sh test
5858
- <<: *osx
59-
env: BAZEL_VERSION=3.1.0
59+
env: BAZEL_VERSION=3.3.0
6060
script: ./scripts/travis.sh test
6161
- <<: *linux
62-
env: BAZEL_VERSION=3.1.0
62+
env: BAZEL_VERSION=3.3.0
6363
script: ./scripts/travis.sh test

tools/bazel

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ abs_path() {
1515
workspace=$(cd $(dirname "$0")/..; pwd)
1616
root_workspace=$(cd $(dirname $(abs_path "$0"))/..; pwd)
1717

18-
default_bazel_version='3.1.0'
18+
default_bazel_version='3.3.0'
1919

2020
if [ -z "$BAZEL_VERSION" ]; then
2121
bazel_version="$default_bazel_version"
@@ -28,13 +28,13 @@ case "$bazel_version" in
2828
bazel_version=$("$BAZEL_REAL" version | awk '/Build label/ {print $3}' | cut -d '-' -f 1)
2929
bazel="$BAZEL_REAL"
3030
;;
31-
'3.0.0')
32-
darwin_sha='c6109f211f932866ef86f6ed996b31910b3a74a8d5275d3d6a416dafe61c00c6'
33-
linux_sha='eb7aaa85d81c6d1caa5352e0573817217d0c364302aeee923a5cdb04f26d2bd3'
31+
'3.2.0')
32+
darwin_sha='0a9379a835a63186220e7dfc160be8971f03b9892bd0c3de6971c521138a1e28'
33+
linux_sha='27d0b65201bc1936ea40eae149b19353e95d9a3b5e2a7d9dd3b4e12665534b0a'
3434
;;
35-
'3.1.0')
36-
darwin_sha='5cfa97031b43432b3c742c80e2e01c41c0acdca7ba1052fc8cf1e291271bc9cd'
37-
linux_sha='7ba815cbac712d061fe728fef958651512ff394b2708e89f79586ec93d1185ed'
35+
'3.3.0')
36+
darwin_sha='fb340fc910630ec2825ef35d7a385726b515e96f80cd52b4cf8e9d4df01f7bae'
37+
linux_sha='1ec706d44d5980b27988601bbac8aa3028488ea136a958d0f57086aa1214ca41'
3838
;;
3939
*)
4040
echo "The requested Bazel version '$bazel_version' is not supported"

0 commit comments

Comments
 (0)