From 8a0ef0e72493c0d2c83b1833c587ceccc9ff92c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Tue, 14 May 2024 21:24:17 +0000 Subject: [PATCH 1/9] 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 6364f9170ee1426e9f8e000b77a22b4442c98ef1 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 21:24:17 +0000 Subject: [PATCH 2/9] 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 746ef565a45a1eeef309530d2e6daed6e5ee07b3 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 21:24:17 +0000 Subject: [PATCH 3/9] 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 b8de291b6f27aa7cb63d21d5b8470be50155d9f2 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 21:24:17 +0000 Subject: [PATCH 4/9] 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 8894372cbf2e7f7666467fb3ddb4cb620401d899 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 21:24:17 +0000 Subject: [PATCH 5/9] Reactivate gz* repos --- ros_controls.rolling-on-jazzy.repos | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 bff0de884363fd0fe101e412b4e6830fce3801c6 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 21:25:50 +0000 Subject: [PATCH 6/9] Also test if repos files have changed --- .github/workflows/rolling-compatibility-humble-binary-build.yml | 1 + .github/workflows/rolling-compatibility-iron-binary-build.yml | 1 + .github/workflows/rolling-compatibility-jazzy-binary-build.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index 3cf1ee8..37db2e3 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - '.github/workflows/rolling-compatibility-humble-binary-build.yml' + - 'ros_controls.rolling-on-humble.repos' 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 a166d40..1e4eb72 100644 --- a/.github/workflows/rolling-compatibility-iron-binary-build.yml +++ b/.github/workflows/rolling-compatibility-iron-binary-build.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - '.github/workflows/rolling-compatibility-iron-binary-build.yml' + - 'ros_controls.rolling-on-iron.repos' 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 ea8fe82..119cb25 100644 --- a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml +++ b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - '.github/workflows/rolling-compatibility-iron-binary-build.yml' + - 'ros_controls.rolling-on-jazzy.repos' schedule: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' From 2e1e060cb1725d317d31ec8b0d3577297986a9dc Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 21:29:43 +0000 Subject: [PATCH 7/9] Add path filters also for other stack builds --- .github/workflows/humble-binary-build.yml | 4 ++++ .github/workflows/iron-binary-build.yml | 4 ++++ .github/workflows/jazzy-binary-build.yml | 4 ++++ .github/workflows/rolling-binary-build.yml | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/.github/workflows/humble-binary-build.yml b/.github/workflows/humble-binary-build.yml index 6fa3261..6337d5d 100644 --- a/.github/workflows/humble-binary-build.yml +++ b/.github/workflows/humble-binary-build.yml @@ -4,6 +4,10 @@ name: Humble Stack Build on: workflow_dispatch: + pull_request: + paths: + - '.github/workflows/humble-binary-build.yml' + - 'ros_controls.humble.repos' schedule: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' diff --git a/.github/workflows/iron-binary-build.yml b/.github/workflows/iron-binary-build.yml index dfc3f90..f566cff 100644 --- a/.github/workflows/iron-binary-build.yml +++ b/.github/workflows/iron-binary-build.yml @@ -4,6 +4,10 @@ name: Iron Stack Build on: workflow_dispatch: + pull_request: + paths: + - '.github/workflows/iron-binary-build.yml' + - 'ros_controls.iron.repos' schedule: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' diff --git a/.github/workflows/jazzy-binary-build.yml b/.github/workflows/jazzy-binary-build.yml index 5d67897..5286aee 100644 --- a/.github/workflows/jazzy-binary-build.yml +++ b/.github/workflows/jazzy-binary-build.yml @@ -4,6 +4,10 @@ name: Jazzy Stack Build on: workflow_dispatch: + pull_request: + paths: + - '.github/workflows/jazzy-binary-build.yml' + - 'ros_controls.jazzy.repos' schedule: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml index daf434d..efc23d0 100644 --- a/.github/workflows/rolling-binary-build.yml +++ b/.github/workflows/rolling-binary-build.yml @@ -4,6 +4,10 @@ name: Rolling Stack Build on: workflow_dispatch: + pull_request: + paths: + - '.github/workflows/rolling-binary-build.yml' + - 'ros_controls.rolling.repos' schedule: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * *' From 9b4b4d0373ec1b192feba3050b3e44d3729c96f5 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 14 May 2024 21:35:00 +0000 Subject: [PATCH 8/9] Add filters for reusable ICI file as well --- .github/workflows/humble-binary-build.yml | 1 + .github/workflows/iron-binary-build.yml | 1 + .github/workflows/jazzy-binary-build.yml | 1 + .github/workflows/rolling-binary-build.yml | 1 + .github/workflows/rolling-compatibility-humble-binary-build.yml | 1 + .github/workflows/rolling-compatibility-iron-binary-build.yml | 1 + .github/workflows/rolling-compatibility-jazzy-binary-build.yml | 1 + 7 files changed, 7 insertions(+) diff --git a/.github/workflows/humble-binary-build.yml b/.github/workflows/humble-binary-build.yml index 6337d5d..09fdb17 100644 --- a/.github/workflows/humble-binary-build.yml +++ b/.github/workflows/humble-binary-build.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - '.github/workflows/humble-binary-build.yml' + - '.github/workflows/reusable-industrial-ci-with-cache.yml' - 'ros_controls.humble.repos' schedule: # Run every morning to detect flakiness and broken dependencies diff --git a/.github/workflows/iron-binary-build.yml b/.github/workflows/iron-binary-build.yml index f566cff..2ba939f 100644 --- a/.github/workflows/iron-binary-build.yml +++ b/.github/workflows/iron-binary-build.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - '.github/workflows/iron-binary-build.yml' + - '.github/workflows/reusable-industrial-ci-with-cache.yml' - 'ros_controls.iron.repos' schedule: # Run every morning to detect flakiness and broken dependencies diff --git a/.github/workflows/jazzy-binary-build.yml b/.github/workflows/jazzy-binary-build.yml index 5286aee..50a5595 100644 --- a/.github/workflows/jazzy-binary-build.yml +++ b/.github/workflows/jazzy-binary-build.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - '.github/workflows/jazzy-binary-build.yml' + - '.github/workflows/reusable-industrial-ci-with-cache.yml' - 'ros_controls.jazzy.repos' schedule: # Run every morning to detect flakiness and broken dependencies diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml index efc23d0..1febf4b 100644 --- a/.github/workflows/rolling-binary-build.yml +++ b/.github/workflows/rolling-binary-build.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - '.github/workflows/rolling-binary-build.yml' + - './.github/workflows/reusable-industrial-ci-with-cache.yml' - 'ros_controls.rolling.repos' schedule: # Run every morning to detect flakiness and broken dependencies diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index 37db2e3..2871118 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - '.github/workflows/rolling-compatibility-humble-binary-build.yml' + - '.github/workflows/reusable-industrial-ci-with-cache.yml' - 'ros_controls.rolling-on-humble.repos' schedule: # Run every morning to detect flakiness and broken dependencies diff --git a/.github/workflows/rolling-compatibility-iron-binary-build.yml b/.github/workflows/rolling-compatibility-iron-binary-build.yml index 1e4eb72..ef58113 100644 --- a/.github/workflows/rolling-compatibility-iron-binary-build.yml +++ b/.github/workflows/rolling-compatibility-iron-binary-build.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - '.github/workflows/rolling-compatibility-iron-binary-build.yml' + - '.github/workflows/reusable-industrial-ci-with-cache.yml' - 'ros_controls.rolling-on-iron.repos' schedule: # Run every morning to detect flakiness and broken dependencies diff --git a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml index 119cb25..bb45523 100644 --- a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml +++ b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - '.github/workflows/rolling-compatibility-iron-binary-build.yml' + - '.github/workflows/reusable-industrial-ci-with-cache.yml' - 'ros_controls.rolling-on-jazzy.repos' schedule: # Run every morning to detect flakiness and broken dependencies From 8a8d2e5bee9d5f734acee537a10da59862762f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Sat, 18 May 2024 18:59:34 +0200 Subject: [PATCH 9/9] Update .github/workflows/rolling-compatibility-jazzy-binary-build.yml Co-authored-by: Sai Kishor Kothakota --- .github/workflows/rolling-compatibility-jazzy-binary-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml index bb45523..29ce625 100644 --- a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml +++ b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: pull_request: paths: - - '.github/workflows/rolling-compatibility-iron-binary-build.yml' + - '.github/workflows/rolling-compatibility-jazzy-binary-build.yml' - '.github/workflows/reusable-industrial-ci-with-cache.yml' - 'ros_controls.rolling-on-jazzy.repos' schedule: