Skip to content

Commit

Permalink
Merge pull request RobotLocomotion#8641 from jwnimmer-tri/bazel012
Browse files Browse the repository at this point in the history
Upgrade to Bazel 0.12.0 on Ubuntu
  • Loading branch information
jamiesnape authored Apr 20, 2018
2 parents da5105a + 54dab1b commit 68c6548
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ endif()
if(APPLE)
set(MINIMUM_BAZEL_VERSION 0.12.0)
else()
set(MINIMUM_BAZEL_VERSION 0.10.1)
set(MINIMUM_BAZEL_VERSION 0.12.0)
endif()

find_package(Bazel ${MINIMUM_BAZEL_VERSION} MODULE REQUIRED)
Expand Down
6 changes: 3 additions & 3 deletions doc/clion.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ Installing CLion
academic license `here <https://www.jetbrains.com/shop/eform/students>`_.

The most recent versions that we have tested for compatibility are:
- CLion 2017.3.3
- Bazel 0.10.1
- "CLion with Bazel" plug-in 2018.01.29.0.0.
- CLion 2017.3.4
- Bazel 0.12.0
- "CLion with Bazel" plug-in 2018.03.26.0.5.

Upgrading CLion
---------------
Expand Down
2 changes: 1 addition & 1 deletion doc/developers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ supported for CMake builds using the "Unix Makefiles" generator.
| Operating System | Build System | C/C++ Compiler | Java | MATLAB (Optional) | Python |
+=============================+=================+====================+============+===================+========+
+-----------------------------+-----------------+--------------------+------------+-------------------+--------+
| Ubuntu 16.04 LTS ("Xenial") | | Bazel 0.10.1 | | Clang 4.0 | OpenJDK 8 | R2017a | 2.7.11 |
| Ubuntu 16.04 LTS ("Xenial") | | Bazel 0.12.0 | | Clang 4.0 | OpenJDK 8 | R2017a | 2.7.11 |
| | | CMake 3.5.1 | | GCC 5.4 | | | |
+-----------------------------+-----------------+--------------------+------------+ +--------+
| macOS 10.12 ("Sierra") | | Bazel 0.12.0 | Apple Clang 9.0.0 | Oracle 1.8 | | 2.7.14 |
Expand Down
6 changes: 3 additions & 3 deletions setup/ubuntu/16.04/source_distribution/install_prereqs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ dpkg_install_from_wget() {
}

dpkg_install_from_wget \
bazel 0.10.1 \
https://github.com/bazelbuild/bazel/releases/download/0.10.1/bazel_0.10.1-linux-x86_64.deb \
28a9e614226ed4ac96ed4e9c0ddc59df2e8eadcfb11e0539c0e5aaead6c1ff2d
bazel 0.12.0 \
https://github.com/bazelbuild/bazel/releases/download/0.12.0/bazel_0.12.0-linux-x86_64.deb \
3d94ca21477289fa369c6077564719dbd89052e6199a527cfa0506bb41c82cd5

0 comments on commit 68c6548

Please sign in to comment.