Skip to content

Commit

Permalink
[bazelisk] Use Bazel 7.1.2
Browse files Browse the repository at this point in the history
install_prereqs: Use Bazelisk
  • Loading branch information
EricCousineau-TRI committed May 13, 2024
1 parent 955245e commit d9b093b
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .lint/.bazeliskrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# When bazelisk in use, this dotfile specifies which version of Bazel should be
# used to build and test.
USE_BAZEL_VERSION=6.4.0
USE_BAZEL_VERSION=7.1.2
2 changes: 1 addition & 1 deletion bazel_ros2_rules/.bazeliskrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# When bazelisk in use, this dotfile specifies which version of Bazel should be
# used to build and test.
USE_BAZEL_VERSION=6.4.0
USE_BAZEL_VERSION=7.1.2
8 changes: 5 additions & 3 deletions bazel_ros2_rules/setup/install_prereqs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@ function dpkg_install_from_curl() {

apt install g++ unzip zlib1g-dev

# TODO(eric.cousineau) Once there's a bazelisk 1.20 that incorporates pr563, we
# should switch to using that here.
dpkg_install_from_curl \
bazel 6.4.0 \
https://github.com/bazelbuild/bazel/releases/download/6.4.0/bazel_6.4.0-linux-x86_64.deb \
9276a1e11f03e9f7492f009803c95bddc307993c9ab3c463721c9f6cdaa2ccc1
bazelisk 1.19.0 \
https://drake-mirror.csail.mit.edu/github/bazelbuild/bazelisk/pr563/bazelisk_1.19.0-9-g58a850f_amd64.deb \
c2bfd15d6c3422ae540cda9facc0ac395005e2701c09dbb15d40447b53e831d4

# Install Python dependencies
apt install python3 python3-toposort python3-dev python-is-python3
2 changes: 1 addition & 1 deletion drake_ros/.bazeliskrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# When bazelisk in use, this dotfile specifies which version of Bazel should be
# used to build and test.
USE_BAZEL_VERSION=6.4.0
USE_BAZEL_VERSION=7.1.2
2 changes: 1 addition & 1 deletion drake_ros_examples/.bazeliskrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# When bazelisk in use, this dotfile specifies which version of Bazel should be
# used to build and test.
USE_BAZEL_VERSION=6.4.0
USE_BAZEL_VERSION=7.1.2
2 changes: 1 addition & 1 deletion ros2_example_bazel_installed/.bazeliskrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# When bazelisk in use, this dotfile specifies which version of Bazel should be
# used to build and test.
USE_BAZEL_VERSION=6.4.0
USE_BAZEL_VERSION=7.1.2
9 changes: 5 additions & 4 deletions ros2_example_bazel_installed/setup/install_prereqs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@ function dpkg_install_from_curl() {

apt install g++ unzip zlib1g-dev

# TODO(sloretz) Make sure the version of bazel is exactly the same as the one used by Drake
# TODO(eric.cousineau) Once there's a bazelisk 1.20 that incorporates pr563, we
# should switch to using that here.
dpkg_install_from_curl \
bazel 6.4.0 \
https://github.com/bazelbuild/bazel/releases/download/6.4.0/bazel_6.4.0-linux-x86_64.deb \
9276a1e11f03e9f7492f009803c95bddc307993c9ab3c463721c9f6cdaa2ccc1
bazelisk 1.19.0 \
https://drake-mirror.csail.mit.edu/github/bazelbuild/bazelisk/pr563/bazelisk_1.19.0-9-g58a850f_amd64.deb \
c2bfd15d6c3422ae540cda9facc0ac395005e2701c09dbb15d40447b53e831d4

# If the user did not explicitly specify their installation prefix, install
# ROS 2 Humble.
Expand Down

0 comments on commit d9b093b

Please sign in to comment.