From f369fd3e5f5d2a5e2108bed076ae593f16763ee9 Mon Sep 17 00:00:00 2001 From: Aditya Pande Date: Mon, 11 Mar 2024 19:44:16 +0000 Subject: [PATCH 1/6] Test CI on main Signed-off-by: Aditya Pande --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 95b956fa..f8112961 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ ## Getting Started + See [`drake_ros_examples`](./drake_ros_examples) for an example of getting started with both Drake and ROS 2 using `colcon`. From ed16eaa4892a11c7a27f56b872fd3498ed7a9b21 Mon Sep 17 00:00:00 2001 From: Aditya Pande Date: Mon, 11 Mar 2024 23:23:32 +0000 Subject: [PATCH 2/6] Changed rolling to iron in CI Signed-off-by: Aditya Pande --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 311efae5..e1789deb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: matrix: include: - os_code_name: jammy - ros_distro: rolling + ros_distro: iron - os_code_name: jammy ros_distro: humble name: test_against_${{matrix.ros_distro}}_debs @@ -44,7 +44,7 @@ jobs: matrix: include: - os_code_name: jammy - ros_distro: rolling + ros_distro: iron - os_code_name: jammy ros_distro: humble name: test_against_${{matrix.ros_distro}}_archive From d3d79f6f56d14a4df91f71025950f41b56bd1f7a Mon Sep 17 00:00:00 2001 From: Aditya Pande Date: Tue, 12 Mar 2024 20:39:34 +0000 Subject: [PATCH 3/6] Disable rolling CI Signed-off-by: Aditya Pande --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1789deb..91a17ed7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,8 +14,8 @@ jobs: strategy: matrix: include: - - os_code_name: jammy - ros_distro: iron + #- os_code_name: jammy + # ros_distro: rolling - os_code_name: jammy ros_distro: humble name: test_against_${{matrix.ros_distro}}_debs @@ -43,8 +43,8 @@ jobs: strategy: matrix: include: - - os_code_name: jammy - ros_distro: iron + #- os_code_name: jammy + # ros_distro: rolling - os_code_name: jammy ros_distro: humble name: test_against_${{matrix.ros_distro}}_archive From eee78f3c267bb907c3b142579efbfd6fb1e038a0 Mon Sep 17 00:00:00 2001 From: Aditya Pande Date: Tue, 12 Mar 2024 20:44:43 +0000 Subject: [PATCH 4/6] Remove blank line Signed-off-by: Aditya Pande --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index f8112961..95b956fa 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ ## Getting Started - See [`drake_ros_examples`](./drake_ros_examples) for an example of getting started with both Drake and ROS 2 using `colcon`. From f9da3cc82f79a4fa5e02e53ac518b685c855da6c Mon Sep 17 00:00:00 2001 From: Aditya Pande Date: Tue, 12 Mar 2024 20:56:57 +0000 Subject: [PATCH 5/6] Use C++ 20 Signed-off-by: Aditya Pande --- drake_ros/CMakeLists.txt | 4 ++-- drake_ros_examples/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drake_ros/CMakeLists.txt b/drake_ros/CMakeLists.txt index 412091fd..aa83f42e 100644 --- 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 index 270facac..af64c646 100644 --- 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") From 0d41e97212b19cc7138f873ec2e3cb1052f6a5ce Mon Sep 17 00:00:00 2001 From: Aditya Pande Date: Tue, 19 Mar 2024 22:46:00 +0000 Subject: [PATCH 6/6] Added comment Signed-off-by: Aditya Pande --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 91a17ed7..e7172006 100644 --- 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