From b90caba9d4302b699c9686ab3ee0e2e4624a80d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Fri, 10 May 2024 17:35:18 +0200 Subject: [PATCH 01/18] Update jazzy-binary-build.yml --- .github/workflows/jazzy-binary-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jazzy-binary-build.yml b/.github/workflows/jazzy-binary-build.yml index 85f7895..5d67897 100644 --- a/.github/workflows/jazzy-binary-build.yml +++ b/.github/workflows/jazzy-binary-build.yml @@ -1,5 +1,5 @@ -name: Rolling Stack Build -# author: Denis Štogl +name: Jazzy Stack Build +# author: Christoph Froehlich # description: 'Build & test all dependencies from released (binary) packages.' on: From 0a08a8df3bb400a8ebf523edb663be68da7513f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Fri, 10 May 2024 17:42:29 +0200 Subject: [PATCH 02/18] Update workflow names (for better badges visibility) (#79) --- .../workflows/rolling-compatibility-humble-binary-build.yml | 4 +++- .github/workflows/rolling-compatibility-iron-binary-build.yml | 4 +++- .../workflows/rolling-compatibility-jazzy-binary-build.yml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index 0a6dd6d..a5a4d8a 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -1,4 +1,6 @@ -name: Check Rolling Compatibility on Humble with Stack Build +name: Check Rolling Compatibility on Humble +# author: Christoph Froehlich +# description: 'Build & test the rolling stack on Humble distro.' on: workflow_dispatch: diff --git a/.github/workflows/rolling-compatibility-iron-binary-build.yml b/.github/workflows/rolling-compatibility-iron-binary-build.yml index 09b606e..04f39bb 100644 --- a/.github/workflows/rolling-compatibility-iron-binary-build.yml +++ b/.github/workflows/rolling-compatibility-iron-binary-build.yml @@ -1,4 +1,6 @@ -name: Check Rolling Compatibility on Iron with Stack Build +name: Check Rolling Compatibility on Iron +# author: Christoph Froehlich +# description: 'Build & test the rolling stack on Iron distro.' on: workflow_dispatch: diff --git a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml index 8e1f3f1..c3d0d19 100644 --- a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml +++ b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml @@ -1,4 +1,6 @@ -name: Check Rolling Compatibility on Iron with Stack Build +name: Check Rolling Compatibility on Jazzy +# author: Christoph Froehlich +# description: 'Build & test the rolling stack on Jazzy distro.' on: workflow_dispatch: From 80853fa0e8b78cb0c519f9f911c8597129689fb8 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sat, 11 May 2024 07:04:33 +0000 Subject: [PATCH 03/18] Deactivate gz_ros2_control also for jazzy compatibility --- ros_controls.rolling-on-jazzy.repos | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/ros_controls.rolling-on-jazzy.repos b/ros_controls.rolling-on-jazzy.repos index 01d3aba..34c9764 100644 --- a/ros_controls.rolling-on-jazzy.repos +++ b/ros_controls.rolling-on-jazzy.repos @@ -7,14 +7,10 @@ repositories: type: git url: https://github.com/ros-controls/control_toolbox.git version: ros2-master - ros-controls/gazebo_ros2_control: - type: git - url: https://github.com/ros-controls/gazebo_ros2_control.git - version: master - ros-controls/gz_ros2_control: - type: git - url: https://github.com/ros-controls/gz_ros2_control.git - version: master + # ros-controls/gz_ros2_control: + # type: git + # url: https://github.com/ros-controls/gz_ros2_control.git + # version: master ros-controls/kinematics_interface: type: git url: https://github.com/ros-controls/kinematics_interface.git @@ -27,10 +23,10 @@ repositories: type: git url: https://github.com/ros-controls/ros2_control.git version: master - ros-controls/ros2_control_demos: - type: git - url: https://github.com/ros-controls/ros2_control_demos.git - version: master + # ros-controls/ros2_control_demos: + # type: git + # url: https://github.com/ros-controls/ros2_control_demos.git + # version: master ros-controls/ros2_controllers: type: git url: https://github.com/ros-controls/ros2_controllers.git From c49cb8fb13fb415c2ae55e3a511e397c0016a070 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 12:14:51 +0000 Subject: [PATCH 04/18] Test if we can compile gz_plugin_vendor --- ros_controls.rolling-on-humble.repos | 4 ++++ ros_controls.rolling-on-iron.repos | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ros_controls.rolling-on-humble.repos b/ros_controls.rolling-on-humble.repos index 479db64..68bb384 100644 --- a/ros_controls.rolling-on-humble.repos +++ b/ros_controls.rolling-on-humble.repos @@ -35,3 +35,7 @@ repositories: type: git url: https://github.com/ros-controls/ros2_controllers.git version: master + gz/gz_plugin_vendor: + type: git + url: https://github.com/gazebo-release/gz_plugin_vendor.git + version: rolling diff --git a/ros_controls.rolling-on-iron.repos b/ros_controls.rolling-on-iron.repos index 479db64..68bb384 100644 --- a/ros_controls.rolling-on-iron.repos +++ b/ros_controls.rolling-on-iron.repos @@ -35,3 +35,7 @@ repositories: type: git url: https://github.com/ros-controls/ros2_controllers.git version: master + gz/gz_plugin_vendor: + type: git + url: https://github.com/gazebo-release/gz_plugin_vendor.git + version: rolling From efef0832956d740173e70c71dd0559a37b28c764 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 12:14:51 +0000 Subject: [PATCH 05/18] Add more gz*vendor repos --- ros_controls.rolling-on-humble.repos | 16 ++++++++++++++++ ros_controls.rolling-on-iron.repos | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/ros_controls.rolling-on-humble.repos b/ros_controls.rolling-on-humble.repos index 68bb384..05427a6 100644 --- a/ros_controls.rolling-on-humble.repos +++ b/ros_controls.rolling-on-humble.repos @@ -39,3 +39,19 @@ repositories: type: git url: https://github.com/gazebo-release/gz_plugin_vendor.git version: rolling + gz/gz_sim_vendor: + type: git + url: https://github.com/gazebo-release/gz_sim_vendor.git + version: rolling + gz/gz_cmake_vendor: + type: git + url: https://github.com/gazebo-release/gz_cmake_vendor.git + version: rolling + gz/gz_utils_vendor: + type: git + url: https://github.com/gazebo-release/gz_utils_vendor.git + version: rolling + gz/gz_tools_vendor: + type: git + url: https://github.com/gazebo-release/gz_tools_vendor.git + version: rolling diff --git a/ros_controls.rolling-on-iron.repos b/ros_controls.rolling-on-iron.repos index 68bb384..05427a6 100644 --- a/ros_controls.rolling-on-iron.repos +++ b/ros_controls.rolling-on-iron.repos @@ -39,3 +39,19 @@ repositories: type: git url: https://github.com/gazebo-release/gz_plugin_vendor.git version: rolling + gz/gz_sim_vendor: + type: git + url: https://github.com/gazebo-release/gz_sim_vendor.git + version: rolling + gz/gz_cmake_vendor: + type: git + url: https://github.com/gazebo-release/gz_cmake_vendor.git + version: rolling + gz/gz_utils_vendor: + type: git + url: https://github.com/gazebo-release/gz_utils_vendor.git + version: rolling + gz/gz_tools_vendor: + type: git + url: https://github.com/gazebo-release/gz_tools_vendor.git + version: rolling From dc157d89a15cabf54b475675de0cb6b2c1950b21 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 12:14:51 +0000 Subject: [PATCH 06/18] Add more gz*vendor repos --- ros_controls.rolling-on-humble.repos | 4 ++++ ros_controls.rolling-on-iron.repos | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ros_controls.rolling-on-humble.repos b/ros_controls.rolling-on-humble.repos index 05427a6..96b4b2a 100644 --- a/ros_controls.rolling-on-humble.repos +++ b/ros_controls.rolling-on-humble.repos @@ -55,3 +55,7 @@ repositories: type: git url: https://github.com/gazebo-release/gz_tools_vendor.git version: rolling + gz/sdformat_vendor: + type: git + url: https://github.com/gazebo-release/sdformat_vendor.git + version: rolling diff --git a/ros_controls.rolling-on-iron.repos b/ros_controls.rolling-on-iron.repos index 05427a6..96b4b2a 100644 --- a/ros_controls.rolling-on-iron.repos +++ b/ros_controls.rolling-on-iron.repos @@ -55,3 +55,7 @@ repositories: type: git url: https://github.com/gazebo-release/gz_tools_vendor.git version: rolling + gz/sdformat_vendor: + type: git + url: https://github.com/gazebo-release/sdformat_vendor.git + version: rolling From bd1d829df0c7bde110a6faeceecaa0570ea24f6a Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 12:14:51 +0000 Subject: [PATCH 07/18] Add more gz*vendor repos --- ros_controls.rolling-on-humble.repos | 44 ++++++++++++++++++++++++++++ ros_controls.rolling-on-iron.repos | 44 ++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/ros_controls.rolling-on-humble.repos b/ros_controls.rolling-on-humble.repos index 96b4b2a..ccc7145 100644 --- a/ros_controls.rolling-on-humble.repos +++ b/ros_controls.rolling-on-humble.repos @@ -59,3 +59,47 @@ repositories: type: git url: https://github.com/gazebo-release/sdformat_vendor.git version: rolling + gz/gz_math_vendor: + type: git + url: https://github.com/gazebo-release/gz_math_vendor.git + version: rolling + gz/gz_transport_vendor: + type: git + url: https://github.com/gazebo-release/gz_transport_vendor.git + version: rolling + gz/gz_sensors_vendor: + type: git + url: https://github.com/gazebo-release/gz_sensors_vendor.git + version: rolling + gz/gz_msgs_vendor: + type: git + url: https://github.com/gazebo-release/gz_msgs_vendor.git + version: rolling + gz/gz_common_vendor: + type: git + url: https://github.com/gazebo-release/gz_common_vendor.git + version: rolling + gz/gz_rendering_vendor: + type: git + url: https://github.com/gazebo-release/gz_rendering_vendor.git + version: rolling + gz/gz_ogre_next_vendor: + type: git + url: https://github.com/gazebo-release/gz_ogre_next_vendor.git + version: rolling + gz/gz_physics_vendor: + type: git + url: https://github.com/gazebo-release/gz_physics_vendor.git + version: rolling + gz/gz_fuel_tools_vendor: + type: git + url: https://github.com/gazebo-release/gz_fuel_tools_vendor.git + version: rolling + gz/gz_gui_vendor: + type: git + url: https://github.com/gazebo-release/gz_gui_vendor.git + version: rolling + gz/gz_dartsim_vendor: + type: git + url: https://github.com/gazebo-release/gz_dartsim_vendor.git + version: rolling diff --git a/ros_controls.rolling-on-iron.repos b/ros_controls.rolling-on-iron.repos index 96b4b2a..ccc7145 100644 --- a/ros_controls.rolling-on-iron.repos +++ b/ros_controls.rolling-on-iron.repos @@ -59,3 +59,47 @@ repositories: type: git url: https://github.com/gazebo-release/sdformat_vendor.git version: rolling + gz/gz_math_vendor: + type: git + url: https://github.com/gazebo-release/gz_math_vendor.git + version: rolling + gz/gz_transport_vendor: + type: git + url: https://github.com/gazebo-release/gz_transport_vendor.git + version: rolling + gz/gz_sensors_vendor: + type: git + url: https://github.com/gazebo-release/gz_sensors_vendor.git + version: rolling + gz/gz_msgs_vendor: + type: git + url: https://github.com/gazebo-release/gz_msgs_vendor.git + version: rolling + gz/gz_common_vendor: + type: git + url: https://github.com/gazebo-release/gz_common_vendor.git + version: rolling + gz/gz_rendering_vendor: + type: git + url: https://github.com/gazebo-release/gz_rendering_vendor.git + version: rolling + gz/gz_ogre_next_vendor: + type: git + url: https://github.com/gazebo-release/gz_ogre_next_vendor.git + version: rolling + gz/gz_physics_vendor: + type: git + url: https://github.com/gazebo-release/gz_physics_vendor.git + version: rolling + gz/gz_fuel_tools_vendor: + type: git + url: https://github.com/gazebo-release/gz_fuel_tools_vendor.git + version: rolling + gz/gz_gui_vendor: + type: git + url: https://github.com/gazebo-release/gz_gui_vendor.git + version: rolling + gz/gz_dartsim_vendor: + type: git + url: https://github.com/gazebo-release/gz_dartsim_vendor.git + version: rolling From 2012c469ccd080c4984734455182795b71189218 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 12:17:26 +0000 Subject: [PATCH 08/18] Reactivate gz* repos --- ros_controls.rolling-on-humble.repos | 16 ++++++++-------- ros_controls.rolling-on-iron.repos | 16 ++++++++-------- ros_controls.rolling-on-jazzy.repos | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ros_controls.rolling-on-humble.repos b/ros_controls.rolling-on-humble.repos index ccc7145..6f912a3 100644 --- a/ros_controls.rolling-on-humble.repos +++ b/ros_controls.rolling-on-humble.repos @@ -11,10 +11,10 @@ repositories: type: git url: https://github.com/ros-controls/gazebo_ros2_control.git version: master - # ros-controls/gz_ros2_control: - # type: git - # url: https://github.com/ros-controls/gz_ros2_control.git - # version: master + ros-controls/gz_ros2_control: + type: git + url: https://github.com/ros-controls/gz_ros2_control.git + version: master ros-controls/kinematics_interface: type: git url: https://github.com/ros-controls/kinematics_interface.git @@ -27,10 +27,10 @@ repositories: type: git url: https://github.com/ros-controls/ros2_control.git version: master - # ros-controls/ros2_control_demos: - # type: git - # url: https://github.com/ros-controls/ros2_control_demos.git - # version: master + ros-controls/ros2_control_demos: + type: git + url: https://github.com/ros-controls/ros2_control_demos.git + version: master ros-controls/ros2_controllers: type: git url: https://github.com/ros-controls/ros2_controllers.git diff --git a/ros_controls.rolling-on-iron.repos b/ros_controls.rolling-on-iron.repos index ccc7145..6f912a3 100644 --- a/ros_controls.rolling-on-iron.repos +++ b/ros_controls.rolling-on-iron.repos @@ -11,10 +11,10 @@ repositories: type: git url: https://github.com/ros-controls/gazebo_ros2_control.git version: master - # ros-controls/gz_ros2_control: - # type: git - # url: https://github.com/ros-controls/gz_ros2_control.git - # version: master + ros-controls/gz_ros2_control: + type: git + url: https://github.com/ros-controls/gz_ros2_control.git + version: master ros-controls/kinematics_interface: type: git url: https://github.com/ros-controls/kinematics_interface.git @@ -27,10 +27,10 @@ repositories: type: git url: https://github.com/ros-controls/ros2_control.git version: master - # ros-controls/ros2_control_demos: - # type: git - # url: https://github.com/ros-controls/ros2_control_demos.git - # version: master + ros-controls/ros2_control_demos: + type: git + url: https://github.com/ros-controls/ros2_control_demos.git + version: master ros-controls/ros2_controllers: type: git url: https://github.com/ros-controls/ros2_controllers.git diff --git a/ros_controls.rolling-on-jazzy.repos b/ros_controls.rolling-on-jazzy.repos index 34c9764..97cc475 100644 --- a/ros_controls.rolling-on-jazzy.repos +++ b/ros_controls.rolling-on-jazzy.repos @@ -7,10 +7,10 @@ repositories: type: git url: https://github.com/ros-controls/control_toolbox.git version: ros2-master - # ros-controls/gz_ros2_control: - # type: git - # url: https://github.com/ros-controls/gz_ros2_control.git - # version: master + ros-controls/gz_ros2_control: + type: git + url: https://github.com/ros-controls/gz_ros2_control.git + version: master ros-controls/kinematics_interface: type: git url: https://github.com/ros-controls/kinematics_interface.git @@ -23,10 +23,10 @@ repositories: type: git url: https://github.com/ros-controls/ros2_control.git version: master - # ros-controls/ros2_control_demos: - # type: git - # url: https://github.com/ros-controls/ros2_control_demos.git - # version: master + ros-controls/ros2_control_demos: + type: git + url: https://github.com/ros-controls/ros2_control_demos.git + version: master ros-controls/ros2_controllers: type: git url: https://github.com/ros-controls/ros2_controllers.git From 0779beb18f641de7db6aff4a66256ec72699de08 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 12:17:54 +0000 Subject: [PATCH 09/18] Run tests on PRs if yaml has changed --- .../workflows/rolling-compatibility-humble-binary-build.yml | 3 +++ .github/workflows/rolling-compatibility-iron-binary-build.yml | 3 +++ .github/workflows/rolling-compatibility-jazzy-binary-build.yml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index a5a4d8a..3cf1ee8 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -4,6 +4,9 @@ name: Check Rolling Compatibility on Humble on: workflow_dispatch: + pull_request: + paths: + - '.github/workflows/rolling-compatibility-humble-binary-build.yml' schedule: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' diff --git a/.github/workflows/rolling-compatibility-iron-binary-build.yml b/.github/workflows/rolling-compatibility-iron-binary-build.yml index 04f39bb..a166d40 100644 --- a/.github/workflows/rolling-compatibility-iron-binary-build.yml +++ b/.github/workflows/rolling-compatibility-iron-binary-build.yml @@ -4,6 +4,9 @@ name: Check Rolling Compatibility on Iron on: workflow_dispatch: + pull_request: + paths: + - '.github/workflows/rolling-compatibility-iron-binary-build.yml' schedule: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' diff --git a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml index c3d0d19..ea8fe82 100644 --- a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml +++ b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml @@ -4,6 +4,9 @@ name: Check Rolling Compatibility on Jazzy on: workflow_dispatch: + pull_request: + paths: + - '.github/workflows/rolling-compatibility-iron-binary-build.yml' schedule: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' From dbca8114f2855a866672f6bc713e2d7b39be8095 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 12:18:08 +0000 Subject: [PATCH 10/18] Add rosdep_skip_keys input for jammy --- .github/workflows/rolling-compatibility-humble-binary-build.yml | 1 + .github/workflows/rolling-compatibility-iron-binary-build.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index 3cf1ee8..bed9aa5 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -24,3 +24,4 @@ jobs: ros_repo: ${{ matrix.ROS_REPO }} target_workspace: ros_controls.rolling-on-humble.repos ref_for_scheduled_build: master + rosdep_skip_keys: libshaderc-dev glslc # not available on jammy diff --git a/.github/workflows/rolling-compatibility-iron-binary-build.yml b/.github/workflows/rolling-compatibility-iron-binary-build.yml index a166d40..9e1ecc7 100644 --- a/.github/workflows/rolling-compatibility-iron-binary-build.yml +++ b/.github/workflows/rolling-compatibility-iron-binary-build.yml @@ -24,3 +24,4 @@ jobs: ros_repo: ${{ matrix.ROS_REPO }} target_workspace: ros_controls.rolling-on-iron.repos ref_for_scheduled_build: master + rosdep_skip_keys: libshaderc-dev glslc # not available on jammy From 4be8b67c6d895abe502b59af26fbda0cd1fbe9ec Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 12:25:15 +0000 Subject: [PATCH 11/18] Format README --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c7e20d..74f411d 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,18 @@ It also builds the full ros2_control stack once per day. ## Released versions [![Rolling Stack Build](https://github.com/ros-controls/ros2_control_ci/actions/workflows/rolling-binary-build.yml/badge.svg)](https://github.com/ros-controls/ros2_control_ci/actions/workflows/rolling-binary-build.yml) + [![Jazzy Stack Build](https://github.com/ros-controls/ros2_control_ci/actions/workflows/jazzy-binary-build.yml/badge.svg)](https://github.com/ros-controls/ros2_control_ci/actions/workflows/jazzy-binary-build.yml) + [![Iron Stack Build](https://github.com/ros-controls/ros2_control_ci/actions/workflows/iron-binary-build.yml/badge.svg)](https://github.com/ros-controls/ros2_control_ci/actions/workflows/iron-binary-build.yml) + [![Humble Stack Build](https://github.com/ros-controls/ros2_control_ci/actions/workflows/humble-binary-build.yml/badge.svg)](https://github.com/ros-controls/ros2_control_ci/actions/workflows/humble-binary-build.yml) ## Compatibility versions We thrive to make the rolling development version of the ros2_control stack compatible with earlier releases of ROS2. This is done by building the rolling version of the stack from source with the earlier releases of ROS2. -[![Check Rolling Compatibility on Iron with Stack Build](https://github.com/ros-controls/ros2_control_ci/actions/workflows/rolling-compatibility-iron-binary-build.yml/badge.svg)](https://github.com/ros-controls/ros2_control_ci/actions/workflows/rolling-compatibility-iron-binary-build.yml) [![Check Rolling Compatibility on Jazzy with Stack Build](https://github.com/ros-controls/ros2_control_ci/actions/workflows/rolling-compatibility-jazzy-binary-build.yml/badge.svg)](https://github.com/ros-controls/ros2_control_ci/actions/workflows/rolling-compatibility-jazzy-binary-build.yml) + +[![Check Rolling Compatibility on Iron with Stack Build](https://github.com/ros-controls/ros2_control_ci/actions/workflows/rolling-compatibility-iron-binary-build.yml/badge.svg)](https://github.com/ros-controls/ros2_control_ci/actions/workflows/rolling-compatibility-iron-binary-build.yml) + [![Check Rolling Compatibility on Humble with Stack Build](https://github.com/ros-controls/ros2_control_ci/actions/workflows/rolling-compatibility-humble-binary-build.yml/badge.svg)](https://github.com/ros-controls/ros2_control_ci/actions/workflows/rolling-compatibility-humble-binary-build.yml) From ce63cf378759ba2625c55a73baa5076961b968ef Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 20:21:46 +0000 Subject: [PATCH 12/18] Add ros_gz to compile from source --- .../workflows/rolling-compatibility-humble-binary-build.yml | 3 +++ .github/workflows/rolling-compatibility-iron-binary-build.yml | 3 +++ ros_controls.rolling-on-humble.repos | 4 ++++ ros_controls.rolling-on-iron.repos | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index bed9aa5..f1570ad 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -11,6 +11,9 @@ on: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' +env: + GZ_VERSION: "harmonic" + jobs: stack-build-on-humble: uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml diff --git a/.github/workflows/rolling-compatibility-iron-binary-build.yml b/.github/workflows/rolling-compatibility-iron-binary-build.yml index 9e1ecc7..5f24cfd 100644 --- a/.github/workflows/rolling-compatibility-iron-binary-build.yml +++ b/.github/workflows/rolling-compatibility-iron-binary-build.yml @@ -11,6 +11,9 @@ on: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' +env: + GZ_VERSION: "harmonic" + jobs: stack-build-on-iron: uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml diff --git a/ros_controls.rolling-on-humble.repos b/ros_controls.rolling-on-humble.repos index 6f912a3..190332c 100644 --- a/ros_controls.rolling-on-humble.repos +++ b/ros_controls.rolling-on-humble.repos @@ -103,3 +103,7 @@ repositories: type: git url: https://github.com/gazebo-release/gz_dartsim_vendor.git version: rolling + gz/ros_gz: + type: git + url: https://github.com/gazebosim/ros_gz.git + version: ros2 diff --git a/ros_controls.rolling-on-iron.repos b/ros_controls.rolling-on-iron.repos index 6f912a3..190332c 100644 --- a/ros_controls.rolling-on-iron.repos +++ b/ros_controls.rolling-on-iron.repos @@ -103,3 +103,7 @@ repositories: type: git url: https://github.com/gazebo-release/gz_dartsim_vendor.git version: rolling + gz/ros_gz: + type: git + url: https://github.com/gazebosim/ros_gz.git + version: ros2 From 6ee60552219c80a153819df2e4b1b1bc668cb9ad Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 20:22:28 +0000 Subject: [PATCH 13/18] Don't use ROS_REPO main for compatibility tests --- .../workflows/rolling-compatibility-humble-binary-build.yml | 2 +- .github/workflows/rolling-compatibility-iron-binary-build.yml | 4 ++-- .../workflows/rolling-compatibility-jazzy-binary-build.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index f1570ad..68c0284 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: ROS_DISTRO: [humble] - ROS_REPO: [main, testing] + ROS_REPO: [testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} ros_repo: ${{ matrix.ROS_REPO }} diff --git a/.github/workflows/rolling-compatibility-iron-binary-build.yml b/.github/workflows/rolling-compatibility-iron-binary-build.yml index 5f24cfd..8d2ebb8 100644 --- a/.github/workflows/rolling-compatibility-iron-binary-build.yml +++ b/.github/workflows/rolling-compatibility-iron-binary-build.yml @@ -13,7 +13,7 @@ on: env: GZ_VERSION: "harmonic" - + jobs: stack-build-on-iron: uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: ROS_DISTRO: [iron] - ROS_REPO: [main, testing] + ROS_REPO: [testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} ros_repo: ${{ matrix.ROS_REPO }} diff --git a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml index ea8fe82..2dfdf74 100644 --- a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml +++ b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: ROS_DISTRO: [jazzy] - ROS_REPO: [main, testing] + ROS_REPO: [testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} ros_repo: ${{ matrix.ROS_REPO }} From 393bd0f2d1f6259c4eee3c7ca6148c18820c0d08 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 20:25:38 +0000 Subject: [PATCH 14/18] Fix format --- .github/workflows/rolling-compatibility-humble-binary-build.yml | 2 +- .github/workflows/rolling-compatibility-iron-binary-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index 68c0284..e0f70ce 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -11,7 +11,7 @@ on: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' -env: +env: GZ_VERSION: "harmonic" jobs: diff --git a/.github/workflows/rolling-compatibility-iron-binary-build.yml b/.github/workflows/rolling-compatibility-iron-binary-build.yml index 8d2ebb8..965472a 100644 --- a/.github/workflows/rolling-compatibility-iron-binary-build.yml +++ b/.github/workflows/rolling-compatibility-iron-binary-build.yml @@ -11,7 +11,7 @@ on: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' -env: +env: GZ_VERSION: "harmonic" jobs: From b121f48744777df9ca5a00d21045615570619193 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 20:47:10 +0000 Subject: [PATCH 15/18] Move gz dependencies to upstream repos file --- ...ling-compatibility-humble-binary-build.yml | 1 + ...olling-compatibility-iron-binary-build.yml | 1 + ros_controls.rolling-on-humble.repos | 72 ----------------- ros_controls.rolling-on-iron.repos | 72 ----------------- ros_controls.rolling-upstream.repos | 77 +++++++++++++++++++ 5 files changed, 79 insertions(+), 144 deletions(-) create mode 100644 ros_controls.rolling-upstream.repos diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index e0f70ce..c96f39b 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -25,6 +25,7 @@ jobs: with: ros_distro: ${{ matrix.ROS_DISTRO }} ros_repo: ${{ matrix.ROS_REPO }} + upstream_workspace: ros_controls.rolling-upstream.repos target_workspace: ros_controls.rolling-on-humble.repos ref_for_scheduled_build: master rosdep_skip_keys: libshaderc-dev glslc # not available on jammy diff --git a/.github/workflows/rolling-compatibility-iron-binary-build.yml b/.github/workflows/rolling-compatibility-iron-binary-build.yml index 965472a..f3518b3 100644 --- a/.github/workflows/rolling-compatibility-iron-binary-build.yml +++ b/.github/workflows/rolling-compatibility-iron-binary-build.yml @@ -25,6 +25,7 @@ jobs: with: ros_distro: ${{ matrix.ROS_DISTRO }} ros_repo: ${{ matrix.ROS_REPO }} + upstream_workspace: ros_controls.rolling-upstream.repos target_workspace: ros_controls.rolling-on-iron.repos ref_for_scheduled_build: master rosdep_skip_keys: libshaderc-dev glslc # not available on jammy diff --git a/ros_controls.rolling-on-humble.repos b/ros_controls.rolling-on-humble.repos index 190332c..01d3aba 100644 --- a/ros_controls.rolling-on-humble.repos +++ b/ros_controls.rolling-on-humble.repos @@ -35,75 +35,3 @@ repositories: type: git url: https://github.com/ros-controls/ros2_controllers.git version: master - gz/gz_plugin_vendor: - type: git - url: https://github.com/gazebo-release/gz_plugin_vendor.git - version: rolling - gz/gz_sim_vendor: - type: git - url: https://github.com/gazebo-release/gz_sim_vendor.git - version: rolling - gz/gz_cmake_vendor: - type: git - url: https://github.com/gazebo-release/gz_cmake_vendor.git - version: rolling - gz/gz_utils_vendor: - type: git - url: https://github.com/gazebo-release/gz_utils_vendor.git - version: rolling - gz/gz_tools_vendor: - type: git - url: https://github.com/gazebo-release/gz_tools_vendor.git - version: rolling - gz/sdformat_vendor: - type: git - url: https://github.com/gazebo-release/sdformat_vendor.git - version: rolling - gz/gz_math_vendor: - type: git - url: https://github.com/gazebo-release/gz_math_vendor.git - version: rolling - gz/gz_transport_vendor: - type: git - url: https://github.com/gazebo-release/gz_transport_vendor.git - version: rolling - gz/gz_sensors_vendor: - type: git - url: https://github.com/gazebo-release/gz_sensors_vendor.git - version: rolling - gz/gz_msgs_vendor: - type: git - url: https://github.com/gazebo-release/gz_msgs_vendor.git - version: rolling - gz/gz_common_vendor: - type: git - url: https://github.com/gazebo-release/gz_common_vendor.git - version: rolling - gz/gz_rendering_vendor: - type: git - url: https://github.com/gazebo-release/gz_rendering_vendor.git - version: rolling - gz/gz_ogre_next_vendor: - type: git - url: https://github.com/gazebo-release/gz_ogre_next_vendor.git - version: rolling - gz/gz_physics_vendor: - type: git - url: https://github.com/gazebo-release/gz_physics_vendor.git - version: rolling - gz/gz_fuel_tools_vendor: - type: git - url: https://github.com/gazebo-release/gz_fuel_tools_vendor.git - version: rolling - gz/gz_gui_vendor: - type: git - url: https://github.com/gazebo-release/gz_gui_vendor.git - version: rolling - gz/gz_dartsim_vendor: - type: git - url: https://github.com/gazebo-release/gz_dartsim_vendor.git - version: rolling - gz/ros_gz: - type: git - url: https://github.com/gazebosim/ros_gz.git - version: ros2 diff --git a/ros_controls.rolling-on-iron.repos b/ros_controls.rolling-on-iron.repos index 190332c..01d3aba 100644 --- a/ros_controls.rolling-on-iron.repos +++ b/ros_controls.rolling-on-iron.repos @@ -35,75 +35,3 @@ repositories: type: git url: https://github.com/ros-controls/ros2_controllers.git version: master - gz/gz_plugin_vendor: - type: git - url: https://github.com/gazebo-release/gz_plugin_vendor.git - version: rolling - gz/gz_sim_vendor: - type: git - url: https://github.com/gazebo-release/gz_sim_vendor.git - version: rolling - gz/gz_cmake_vendor: - type: git - url: https://github.com/gazebo-release/gz_cmake_vendor.git - version: rolling - gz/gz_utils_vendor: - type: git - url: https://github.com/gazebo-release/gz_utils_vendor.git - version: rolling - gz/gz_tools_vendor: - type: git - url: https://github.com/gazebo-release/gz_tools_vendor.git - version: rolling - gz/sdformat_vendor: - type: git - url: https://github.com/gazebo-release/sdformat_vendor.git - version: rolling - gz/gz_math_vendor: - type: git - url: https://github.com/gazebo-release/gz_math_vendor.git - version: rolling - gz/gz_transport_vendor: - type: git - url: https://github.com/gazebo-release/gz_transport_vendor.git - version: rolling - gz/gz_sensors_vendor: - type: git - url: https://github.com/gazebo-release/gz_sensors_vendor.git - version: rolling - gz/gz_msgs_vendor: - type: git - url: https://github.com/gazebo-release/gz_msgs_vendor.git - version: rolling - gz/gz_common_vendor: - type: git - url: https://github.com/gazebo-release/gz_common_vendor.git - version: rolling - gz/gz_rendering_vendor: - type: git - url: https://github.com/gazebo-release/gz_rendering_vendor.git - version: rolling - gz/gz_ogre_next_vendor: - type: git - url: https://github.com/gazebo-release/gz_ogre_next_vendor.git - version: rolling - gz/gz_physics_vendor: - type: git - url: https://github.com/gazebo-release/gz_physics_vendor.git - version: rolling - gz/gz_fuel_tools_vendor: - type: git - url: https://github.com/gazebo-release/gz_fuel_tools_vendor.git - version: rolling - gz/gz_gui_vendor: - type: git - url: https://github.com/gazebo-release/gz_gui_vendor.git - version: rolling - gz/gz_dartsim_vendor: - type: git - url: https://github.com/gazebo-release/gz_dartsim_vendor.git - version: rolling - gz/ros_gz: - type: git - url: https://github.com/gazebosim/ros_gz.git - version: ros2 diff --git a/ros_controls.rolling-upstream.repos b/ros_controls.rolling-upstream.repos new file mode 100644 index 0000000..e9c1583 --- /dev/null +++ b/ros_controls.rolling-upstream.repos @@ -0,0 +1,77 @@ +repositories: + gz/gz_plugin_vendor: + type: git + url: https://github.com/gazebo-release/gz_plugin_vendor.git + version: rolling + gz/gz_sim_vendor: + type: git + url: https://github.com/gazebo-release/gz_sim_vendor.git + version: rolling + gz/gz_cmake_vendor: + type: git + url: https://github.com/gazebo-release/gz_cmake_vendor.git + version: rolling + gz/gz_utils_vendor: + type: git + url: https://github.com/gazebo-release/gz_utils_vendor.git + version: rolling + gz/gz_tools_vendor: + type: git + url: https://github.com/gazebo-release/gz_tools_vendor.git + version: rolling + gz/sdformat_vendor: + type: git + url: https://github.com/gazebo-release/sdformat_vendor.git + version: rolling + gz/gz_math_vendor: + type: git + url: https://github.com/gazebo-release/gz_math_vendor.git + version: rolling + gz/gz_transport_vendor: + type: git + url: https://github.com/gazebo-release/gz_transport_vendor.git + version: rolling + gz/gz_sensors_vendor: + type: git + url: https://github.com/gazebo-release/gz_sensors_vendor.git + version: rolling + gz/gz_msgs_vendor: + type: git + url: https://github.com/gazebo-release/gz_msgs_vendor.git + version: rolling + gz/gz_common_vendor: + type: git + url: https://github.com/gazebo-release/gz_common_vendor.git + version: rolling + gz/gz_rendering_vendor: + type: git + url: https://github.com/gazebo-release/gz_rendering_vendor.git + version: rolling + gz/gz_ogre_next_vendor: + type: git + url: https://github.com/gazebo-release/gz_ogre_next_vendor.git + version: rolling + gz/gz_physics_vendor: + type: git + url: https://github.com/gazebo-release/gz_physics_vendor.git + version: rolling + gz/gz_fuel_tools_vendor: + type: git + url: https://github.com/gazebo-release/gz_fuel_tools_vendor.git + version: rolling + gz/gz_gui_vendor: + type: git + url: https://github.com/gazebo-release/gz_gui_vendor.git + version: rolling + gz/gz_dartsim_vendor: + type: git + url: https://github.com/gazebo-release/gz_dartsim_vendor.git + version: rolling + gz/ros_gz: + type: git + url: https://github.com/gazebosim/ros_gz.git + version: ros2 + ros2/rosidl: + type: git + url: https://github.com/ros2/rosidl.git + version: iron # may be more stable than rolling? From 844c758e9206bc6639ed4490e89f769739187ecc Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 20:58:27 +0000 Subject: [PATCH 16/18] Try not to compile everything from rosidl --- .../workflows/rolling-compatibility-humble-binary-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index c96f39b..857cf57 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -25,7 +25,8 @@ jobs: with: ros_distro: ${{ matrix.ROS_DISTRO }} ros_repo: ${{ matrix.ROS_REPO }} - upstream_workspace: ros_controls.rolling-upstream.repos + # install upstream dependencies for gz*, but exclude some packages inside rosidl repository + upstream_workspace: ros_controls.rolling-upstream.repos -rosidl_generator_tests -rosidl_typesupport_introspection_tests -rosidl_typesupport_introspection_c -rosidl_typesupport_introspection_cpp -rosidl_typesupport_interface -rosidl_runtime_c -rosidl_runtime_cpp -rosidl_parser -rosidl_generator_type_description -rosidl_generator_c -rosidl_generator_cpp -rosidl_cmake -rosidl_cli -rosidl_adapter target_workspace: ros_controls.rolling-on-humble.repos ref_for_scheduled_build: master rosdep_skip_keys: libshaderc-dev glslc # not available on jammy From 7fe80038337f52656e51d52912be4253b9ee3277 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 21:04:34 +0000 Subject: [PATCH 17/18] Try fixing ici syntax --- .github/workflows/rolling-compatibility-humble-binary-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index 857cf57..71b1533 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -26,7 +26,7 @@ jobs: ros_distro: ${{ matrix.ROS_DISTRO }} ros_repo: ${{ matrix.ROS_REPO }} # install upstream dependencies for gz*, but exclude some packages inside rosidl repository - upstream_workspace: ros_controls.rolling-upstream.repos -rosidl_generator_tests -rosidl_typesupport_introspection_tests -rosidl_typesupport_introspection_c -rosidl_typesupport_introspection_cpp -rosidl_typesupport_interface -rosidl_runtime_c -rosidl_runtime_cpp -rosidl_parser -rosidl_generator_type_description -rosidl_generator_c -rosidl_generator_cpp -rosidl_cmake -rosidl_cli -rosidl_adapter + upstream_workspace: ros_controls.rolling-upstream.repos -../ros2/rosidl/rosidl_generator_tests -../ros2/rosidl/rosidl_typesupport_introspection_tests -../ros2/rosidl/rosidl_typesupport_introspection_c -../ros2/rosidl/rosidl_typesupport_introspection_cpp -../ros2/rosidl/rosidl_typesupport_interface -../ros2/rosidl/rosidl_runtime_c -../ros2/rosidl/rosidl_runtime_cpp -../ros2/rosidl/rosidl_parser -../ros2/rosidl/rosidl_generator_type_description -../ros2/rosidl/rosidl_generator_c -../ros2/rosidl/rosidl_generator_cpp -../ros2/rosidl/rosidl_cmake -../ros2/rosidl/rosidl_cli -../ros2/rosidl/rosidl_adapter target_workspace: ros_controls.rolling-on-humble.repos ref_for_scheduled_build: master rosdep_skip_keys: libshaderc-dev glslc # not available on jammy From 5bc9a875637840870d46799d58143139ba9cfb12 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 21:07:06 +0000 Subject: [PATCH 18/18] Use different cache_prefix --- .github/workflows/reusable-industrial-ci-with-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-industrial-ci-with-cache.yml b/.github/workflows/reusable-industrial-ci-with-cache.yml index bff79cb..a47c4ce 100644 --- a/.github/workflows/reusable-industrial-ci-with-cache.yml +++ b/.github/workflows/reusable-industrial-ci-with-cache.yml @@ -68,7 +68,7 @@ jobs: env: CCACHE_DIR: ${{ github.workspace }}/${{ inputs.ccache_dir }} BASEDIR: ${{ github.workspace }}/${{ inputs.basedir }} - CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.upstream_workspace }}-${{ inputs.ros_repo }}-${{ github.job }} + CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.target_workspace }}-${{ inputs.ros_repo }}-${{ github.job }} steps: - name: Checkout ${{ inputs.ref }} when build is not scheduled if: ${{ github.event_name != 'schedule' }}