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

Commit ac845fd

Browse files
borkaehwSrodriguezO
authored andcommitted
Bazel 2.0.0 compatible (#259)
1 parent b2db774 commit ac845fd

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

.bazelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
common --config=rules
2-
common:v1.2 --config=rules_v1.2
2+
common:v2.0 --config=rules_v2.0
33
import %workspace%/.bazelrc_shared

.bazelrc_shared

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

17-
# bazel 1.2.1
18-
common:rules_v1.1 --config=noop
17+
# bazel 2.0.0
1918
common:rules_v1.2 --config=noop
19+
common:rules_v2.0 --config=noop
2020

2121
# route potentially unrouted configs to a terminating noop config
2222
# it's a noop because we use the default value
2323
common:rules --config=noop
2424
common:tests --config=noop
25-
common:v1.1 --config=rules_v1.1
2625
common:v1.2 --config=rules_v1.2
26+
common:v2.0 --config=rules_v2.0
2727

2828
# pick something trivial as a "noop"
2929
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=1.1.0
31+
env: BAZEL_VERSION=1.2.1
3232
script: ./scripts/travis.sh build
3333
- <<: *linux
34-
env: BAZEL_VERSION=1.1.0
34+
env: BAZEL_VERSION=1.2.1
3535
script: ./scripts/travis.sh build
3636
- <<: *osx
37-
env: BAZEL_VERSION=1.2.1
37+
env: BAZEL_VERSION=2.0.0
3838
script: ./scripts/travis.sh build
3939
- <<: *linux
40-
env: BAZEL_VERSION=1.2.1
40+
env: BAZEL_VERSION=2.0.0
4141
script: ./scripts/travis.sh build
4242
# Lint
4343
- stage: lint
4444
<<: *osx
45-
env: BAZEL_VERSION=1.1.0
45+
env: BAZEL_VERSION=1.2.1
4646
script: ./scripts/travis.sh lint
4747
- <<: *linux
48-
env: BAZEL_VERSION=1.2.1
48+
env: BAZEL_VERSION=2.0.0
4949
script: ./scripts/travis.sh lint
5050
# Test
5151
- stage: test
5252
<<: *osx
53-
env: BAZEL_VERSION=1.1.0
53+
env: BAZEL_VERSION=1.2.1
5454
script: ./scripts/travis.sh test
5555
- <<: *linux
56-
env: BAZEL_VERSION=1.1.0
56+
env: BAZEL_VERSION=1.2.1
5757
script: ./scripts/travis.sh test
5858
- <<: *osx
59-
env: BAZEL_VERSION=1.2.1
59+
env: BAZEL_VERSION=2.0.0
6060
script: ./scripts/travis.sh test
6161
- <<: *linux
62-
env: BAZEL_VERSION=1.2.1
62+
env: BAZEL_VERSION=2.0.0
6363
script: ./scripts/travis.sh test

tools/bazel

+5-5
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='1.2.1'
18+
default_bazel_version='2.0.0'
1919

2020
if [ -z "$BAZEL_VERSION" ]; then
2121
bazel_version="$default_bazel_version"
@@ -28,14 +28,14 @@ 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-
'1.1.0')
32-
darwin_sha='1a552f4ce194860fbbd50eeb319f81788ddf50a849e92378eec72231cc64ef65'
33-
linux_sha='14301099c87568db302d59a5d3585f5eb8a6250ac2c6bb0367c56e623ff6e65f'
34-
;;
3531
'1.2.1')
3632
darwin_sha='59e469bf1d8d1615b67856ea17e761be05e9c92b462e55c0354cd78145b480d5'
3733
linux_sha='ae6249e25b0f5a06d79fad90325477dd56275657951cf7aa6a3cbcd79fc4d749'
3834
;;
35+
'2.0.0')
36+
darwin_sha='c675fa27d99a3114d681db10eb03ded547c40f702b2048c99b8f4ea8e89b9356'
37+
linux_sha='2fbdc9c0e3d376697caf0ee3673b7c9475214068c55a01b9744891e131f90b87'
38+
;;
3939
*)
4040
echo "The requested Bazel version '$bazel_version' is not supported"
4141
exit 1

0 commit comments

Comments
 (0)