Merge branch 'main' into aditya/roslaunch

RobotLocomotion · Mar 27, 2024 · a87e1fc · a87e1fc
2 parents 1ddf90e + e2b2ca4
commit a87e1fc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,8 +14,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os_code_name: jammy
-            ros_distro: rolling
+          # TODO : Include rolling later if available on jammy or noble.
           - os_code_name: jammy
             ros_distro: humble
     name: test_against_${{matrix.ros_distro}}_debs
@@ -43,8 +42,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os_code_name: jammy
-            ros_distro: rolling
+          # TODO : Include rolling later if available on jammy or noble.
           - os_code_name: jammy
             ros_distro: humble
     name: test_against_${{matrix.ros_distro}}_archive

diff --git a/default.bazelrc b/default.bazelrc
@@ -1,6 +1,6 @@
-# Use C++17.
-build --cxxopt=-std=c++17
-build --host_cxxopt=-std=c++17
+# Use C++20.
+build --cxxopt=-std=c++20
+build --host_cxxopt=-std=c++20
 
 # Use Python 3.
 build --python_path=/usr/bin/python3

diff --git a/drake_ros/CMakeLists.txt b/drake_ros/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.10)
 project(drake_ros)
 
-# Default to C++17
+# Default to C++20
 if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD 20)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")

diff --git a/drake_ros_examples/CMakeLists.txt b/drake_ros_examples/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.10)
 project(drake_ros_examples)
 
-# Default to C++17
+# Default to C++20
 if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD 20)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")