diff --git a/.bazelrc b/.bazelrc index cec6dcdc..888a2261 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,3 +1,2 @@ common --config=rules -common:v3.1 --config=rules_v3.1 import %workspace%/.bazelrc_shared diff --git a/.bazelrc_shared b/.bazelrc_shared index a8494154..535ef2f7 100644 --- a/.bazelrc_shared +++ b/.bazelrc_shared @@ -14,16 +14,15 @@ test --test_output=all build:rules --disk_cache=.bazel_cache build:tests --disk_cache=../.bazel_cache -# bazel 3.1.0 -common:rules_v3.0 --config=noop -common:rules_v3.1 --config=noop +common:rules_v3.2 --config=noop +common:rules_v3.3 --config=noop # route potentially unrouted configs to a terminating noop config # it's a noop because we use the default value common:rules --config=noop common:tests --config=noop -common:v3.0 --config=rules_v3.0 -common:v3.1 --config=rules_v3.1 +common:v3.2 --config=rules_v3.2 +common:v3.3 --config=rules_v3.3 # pick something trivial as a "noop" common:noop --logging=3 diff --git a/.travis.yml b/.travis.yml index 71454d91..c8584c93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,36 +28,36 @@ jobs: # Build - stage: build <<: *osx - env: BAZEL_VERSION=3.0.0 + env: BAZEL_VERSION=3.2.0 script: ./scripts/travis.sh build - <<: *linux - env: BAZEL_VERSION=3.0.0 + env: BAZEL_VERSION=3.2.0 script: ./scripts/travis.sh build - <<: *osx - env: BAZEL_VERSION=3.1.0 + env: BAZEL_VERSION=3.3.0 script: ./scripts/travis.sh build - <<: *linux - env: BAZEL_VERSION=3.1.0 + env: BAZEL_VERSION=3.3.0 script: ./scripts/travis.sh build # Lint - stage: lint <<: *osx - env: BAZEL_VERSION=3.0.0 + env: BAZEL_VERSION=3.2.0 script: ./scripts/travis.sh lint - <<: *linux - env: BAZEL_VERSION=3.1.0 + env: BAZEL_VERSION=3.3.0 script: ./scripts/travis.sh lint # Test - stage: test <<: *osx - env: BAZEL_VERSION=3.0.0 + env: BAZEL_VERSION=3.2.0 script: ./scripts/travis.sh test - <<: *linux - env: BAZEL_VERSION=3.0.0 + env: BAZEL_VERSION=3.2.0 script: ./scripts/travis.sh test - <<: *osx - env: BAZEL_VERSION=3.1.0 + env: BAZEL_VERSION=3.3.0 script: ./scripts/travis.sh test - <<: *linux - env: BAZEL_VERSION=3.1.0 + env: BAZEL_VERSION=3.3.0 script: ./scripts/travis.sh test diff --git a/tools/bazel b/tools/bazel index 8fc99125..a4541b35 100755 --- a/tools/bazel +++ b/tools/bazel @@ -15,7 +15,7 @@ abs_path() { workspace=$(cd $(dirname "$0")/..; pwd) root_workspace=$(cd $(dirname $(abs_path "$0"))/..; pwd) -default_bazel_version='3.1.0' +default_bazel_version='3.3.0' if [ -z "$BAZEL_VERSION" ]; then bazel_version="$default_bazel_version" @@ -28,13 +28,13 @@ case "$bazel_version" in bazel_version=$("$BAZEL_REAL" version | awk '/Build label/ {print $3}' | cut -d '-' -f 1) bazel="$BAZEL_REAL" ;; - '3.0.0') - darwin_sha='c6109f211f932866ef86f6ed996b31910b3a74a8d5275d3d6a416dafe61c00c6' - linux_sha='eb7aaa85d81c6d1caa5352e0573817217d0c364302aeee923a5cdb04f26d2bd3' + '3.2.0') + darwin_sha='0a9379a835a63186220e7dfc160be8971f03b9892bd0c3de6971c521138a1e28' + linux_sha='27d0b65201bc1936ea40eae149b19353e95d9a3b5e2a7d9dd3b4e12665534b0a' ;; - '3.1.0') - darwin_sha='5cfa97031b43432b3c742c80e2e01c41c0acdca7ba1052fc8cf1e291271bc9cd' - linux_sha='7ba815cbac712d061fe728fef958651512ff394b2708e89f79586ec93d1185ed' + '3.3.0') + darwin_sha='fb340fc910630ec2825ef35d7a385726b515e96f80cd52b4cf8e9d4df01f7bae' + linux_sha='1ec706d44d5980b27988601bbac8aa3028488ea136a958d0f57086aa1214ca41' ;; *) echo "The requested Bazel version '$bazel_version' is not supported"