From 172e0138395fa531f73b77a841bea10def4dba95 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 10 Dec 2024 20:11:05 +0000 Subject: [PATCH 1/7] Add downstream builds --- .../humble-binary-downstream-build.yml | 28 ++++++++++++++++ .../jazzy-binary-downstream-build.yml | 28 ++++++++++++++++ .../rolling-binary-downstream-build.yml | 33 +++++++++++++++++++ ros_controls.humble.repos | 33 +++++++++++++++++++ ros_controls.jazzy.repos | 29 ++++++++++++++++ ros_controls.rolling.repos | 29 ++++++++++++++++ 6 files changed, 180 insertions(+) create mode 100644 .github/workflows/humble-binary-downstream-build.yml create mode 100644 .github/workflows/jazzy-binary-downstream-build.yml create mode 100644 .github/workflows/rolling-binary-downstream-build.yml create mode 100644 ros_controls.humble.repos create mode 100644 ros_controls.jazzy.repos create mode 100644 ros_controls.rolling.repos diff --git a/.github/workflows/humble-binary-downstream-build.yml b/.github/workflows/humble-binary-downstream-build.yml new file mode 100644 index 0000000000..7c9c386569 --- /dev/null +++ b/.github/workflows/humble-binary-downstream-build.yml @@ -0,0 +1,28 @@ +name: Humble Downstream Build +# description: 'Build & test downstream packages from source.' +# author: Christoph Froehlich + +on: + workflow_dispatch: + pull_request: + branches: + - humble + push: + branches: + - humble + +concurrency: + # cancel previous runs of the same workflow, except for pushes on humble branch + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }} + +jobs: + build-downstream: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + with: + ros_distro: humble + ros_repo: testing + ref_for_scheduled_build: master + not_test_build: true + downstream_workspace: ros_controls.humble.repos + not_test_downstream: true diff --git a/.github/workflows/jazzy-binary-downstream-build.yml b/.github/workflows/jazzy-binary-downstream-build.yml new file mode 100644 index 0000000000..c71420d657 --- /dev/null +++ b/.github/workflows/jazzy-binary-downstream-build.yml @@ -0,0 +1,28 @@ +name: Rolling Downstream Build +# description: 'Build & test downstream packages from source.' +# author: Christoph Froehlich + +on: + workflow_dispatch: + pull_request: + branches: + - master + push: + branches: + - master + +concurrency: + # cancel previous runs of the same workflow, except for pushes on master branch + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }} + +jobs: + build-downstream: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + with: + ros_distro: jazzy + ros_repo: testing + ref_for_scheduled_build: master + not_test_build: true + downstream_workspace: ros_controls.jazzy.repos + not_test_downstream: true diff --git a/.github/workflows/rolling-binary-downstream-build.yml b/.github/workflows/rolling-binary-downstream-build.yml new file mode 100644 index 0000000000..aa66813904 --- /dev/null +++ b/.github/workflows/rolling-binary-downstream-build.yml @@ -0,0 +1,33 @@ +name: Rolling Downstream Build +# description: 'Build & test downstream packages from source.' +# author: Christoph Froehlich + +on: + workflow_dispatch: + pull_request: + branches: + - master + push: + branches: + - master + +concurrency: + # cancel previous runs of the same workflow, except for pushes on master branch + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }} + +jobs: + build-downstream: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [rolling] + ROS_REPO: [testing] + with: + ros_distro: ${{ matrix.ROS_DISTRO }} + ros_repo: ${{ matrix.ROS_REPO }} + ref_for_scheduled_build: master + not_test_build: true + downstream_workspace: ros_controls.${{ matrix.ROS_DISTRO }}.repos + not_test_downstream: true diff --git a/ros_controls.humble.repos b/ros_controls.humble.repos new file mode 100644 index 0000000000..f8bd0c72c9 --- /dev/null +++ b/ros_controls.humble.repos @@ -0,0 +1,33 @@ +repositories: + ros-controls/control_msgs: + type: git + url: https://github.com/ros-controls/control_msgs.git + version: humble + ros-controls/control_toolbox: + 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: humble + ros-controls/gz_ros2_control: + type: git + url: https://github.com/ros-controls/gz_ros2_control.git + version: humble + ros-controls/kinematics_interface: + type: git + url: https://github.com/ros-controls/kinematics_interface.git + version: humble + ros-controls/realtime_tools: + type: git + url: https://github.com/ros-controls/realtime_tools.git + version: master + ros-controls/ros2_control_demos: + type: git + url: https://github.com/ros-controls/ros2_control_demos.git + version: humble + ros-controls/ros2_controllers: + type: git + url: https://github.com/ros-controls/ros2_controllers.git + version: humble diff --git a/ros_controls.jazzy.repos b/ros_controls.jazzy.repos new file mode 100644 index 0000000000..ac85ddb6ed --- /dev/null +++ b/ros_controls.jazzy.repos @@ -0,0 +1,29 @@ +repositories: + ros-controls/control_msgs: + type: git + url: https://github.com/ros-controls/control_msgs.git + version: master + ros-controls/control_toolbox: + 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: jazzy + ros-controls/kinematics_interface: + type: git + url: https://github.com/ros-controls/kinematics_interface.git + version: master + ros-controls/realtime_tools: + type: git + url: https://github.com/ros-controls/realtime_tools.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 + version: master diff --git a/ros_controls.rolling.repos b/ros_controls.rolling.repos new file mode 100644 index 0000000000..1edd707053 --- /dev/null +++ b/ros_controls.rolling.repos @@ -0,0 +1,29 @@ +repositories: + ros-controls/control_msgs: + type: git + url: https://github.com/ros-controls/control_msgs.git + version: master + ros-controls/control_toolbox: + 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: rolling + ros-controls/kinematics_interface: + type: git + url: https://github.com/ros-controls/kinematics_interface.git + version: master + ros-controls/realtime_tools: + type: git + url: https://github.com/ros-controls/realtime_tools.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 + version: master From 9721608e1ac6ee6625531469158d4de7b32e48cc Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 10 Dec 2024 20:18:09 +0000 Subject: [PATCH 2/7] Add path filters --- .../humble-binary-downstream-build.yml | 20 +++++++++++++++++++ .../jazzy-binary-downstream-build.yml | 20 +++++++++++++++++++ .../rolling-binary-downstream-build.yml | 20 +++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/.github/workflows/humble-binary-downstream-build.yml b/.github/workflows/humble-binary-downstream-build.yml index 7c9c386569..9265f00a5c 100644 --- a/.github/workflows/humble-binary-downstream-build.yml +++ b/.github/workflows/humble-binary-downstream-build.yml @@ -7,9 +7,29 @@ on: pull_request: branches: - humble + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '**.yaml' + - '.github/workflows/humble-binary-downstream-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros_controls.humble.repos' push: branches: - humble + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '**.yaml' + - '.github/workflows/humble-binary-downstream-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros_controls.humble.repos' concurrency: # cancel previous runs of the same workflow, except for pushes on humble branch diff --git a/.github/workflows/jazzy-binary-downstream-build.yml b/.github/workflows/jazzy-binary-downstream-build.yml index c71420d657..f283bc90fb 100644 --- a/.github/workflows/jazzy-binary-downstream-build.yml +++ b/.github/workflows/jazzy-binary-downstream-build.yml @@ -7,9 +7,29 @@ on: pull_request: branches: - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '**.yaml' + - '.github/workflows/jazzy-binary-downstream-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros_controls.jazzy.repos' push: branches: - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '**.yaml' + - '.github/workflows/jazzy-binary-downstream-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros_controls.jazzy.repos' concurrency: # cancel previous runs of the same workflow, except for pushes on master branch diff --git a/.github/workflows/rolling-binary-downstream-build.yml b/.github/workflows/rolling-binary-downstream-build.yml index aa66813904..90bcb9a34a 100644 --- a/.github/workflows/rolling-binary-downstream-build.yml +++ b/.github/workflows/rolling-binary-downstream-build.yml @@ -7,9 +7,29 @@ on: pull_request: branches: - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '**.yaml' + - '.github/workflows/rolling-binary-downstream-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros_controls.rolling.repos' push: branches: - master + paths: + - '**.hpp' + - '**.h' + - '**.cpp' + - '**.py' + - '**.yaml' + - '.github/workflows/rolling-binary-downstream-build.yml' + - '**/package.xml' + - '**/CMakeLists.txt' + - 'ros_controls.rolling.repos' concurrency: # cancel previous runs of the same workflow, except for pushes on master branch From a120a9698f6e4370517dad9a4fff156c3899c868 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 10 Dec 2024 20:24:55 +0000 Subject: [PATCH 3/7] Add upstream workspace file --- ...l => humble-semi-binary-downstream-build.yml} | 1 + ...ml => jazzy-semi-binary-downstream-build.yml} | 3 ++- ... => rolling-semi-binary-downstream-build.yml} | 1 + ros_controls.humble.repos | 16 ---------------- ros_controls.jazzy.repos | 16 ---------------- ros_controls.rolling.repos | 16 ---------------- 6 files changed, 4 insertions(+), 49 deletions(-) rename .github/workflows/{humble-binary-downstream-build.yml => humble-semi-binary-downstream-build.yml} (96%) rename .github/workflows/{jazzy-binary-downstream-build.yml => jazzy-semi-binary-downstream-build.yml} (94%) rename .github/workflows/{rolling-binary-downstream-build.yml => rolling-semi-binary-downstream-build.yml} (95%) diff --git a/.github/workflows/humble-binary-downstream-build.yml b/.github/workflows/humble-semi-binary-downstream-build.yml similarity index 96% rename from .github/workflows/humble-binary-downstream-build.yml rename to .github/workflows/humble-semi-binary-downstream-build.yml index 9265f00a5c..8a15cb4d3d 100644 --- a/.github/workflows/humble-binary-downstream-build.yml +++ b/.github/workflows/humble-semi-binary-downstream-build.yml @@ -44,5 +44,6 @@ jobs: ros_repo: testing ref_for_scheduled_build: master not_test_build: true + upstream_workspace: ros2_control.humble.repos downstream_workspace: ros_controls.humble.repos not_test_downstream: true diff --git a/.github/workflows/jazzy-binary-downstream-build.yml b/.github/workflows/jazzy-semi-binary-downstream-build.yml similarity index 94% rename from .github/workflows/jazzy-binary-downstream-build.yml rename to .github/workflows/jazzy-semi-binary-downstream-build.yml index f283bc90fb..c376e9a22d 100644 --- a/.github/workflows/jazzy-binary-downstream-build.yml +++ b/.github/workflows/jazzy-semi-binary-downstream-build.yml @@ -1,4 +1,4 @@ -name: Rolling Downstream Build +name: Jazzy Downstream Build # description: 'Build & test downstream packages from source.' # author: Christoph Froehlich @@ -44,5 +44,6 @@ jobs: ros_repo: testing ref_for_scheduled_build: master not_test_build: true + upstream_workspace: ros2_control.jazzy.repos downstream_workspace: ros_controls.jazzy.repos not_test_downstream: true diff --git a/.github/workflows/rolling-binary-downstream-build.yml b/.github/workflows/rolling-semi-binary-downstream-build.yml similarity index 95% rename from .github/workflows/rolling-binary-downstream-build.yml rename to .github/workflows/rolling-semi-binary-downstream-build.yml index 90bcb9a34a..fe0d447cce 100644 --- a/.github/workflows/rolling-binary-downstream-build.yml +++ b/.github/workflows/rolling-semi-binary-downstream-build.yml @@ -49,5 +49,6 @@ jobs: ros_repo: ${{ matrix.ROS_REPO }} ref_for_scheduled_build: master not_test_build: true + upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos downstream_workspace: ros_controls.${{ matrix.ROS_DISTRO }}.repos not_test_downstream: true diff --git a/ros_controls.humble.repos b/ros_controls.humble.repos index f8bd0c72c9..8cb447612b 100644 --- a/ros_controls.humble.repos +++ b/ros_controls.humble.repos @@ -1,12 +1,4 @@ repositories: - ros-controls/control_msgs: - type: git - url: https://github.com/ros-controls/control_msgs.git - version: humble - ros-controls/control_toolbox: - 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 @@ -15,14 +7,6 @@ repositories: type: git url: https://github.com/ros-controls/gz_ros2_control.git version: humble - ros-controls/kinematics_interface: - type: git - url: https://github.com/ros-controls/kinematics_interface.git - version: humble - ros-controls/realtime_tools: - type: git - url: https://github.com/ros-controls/realtime_tools.git - version: master ros-controls/ros2_control_demos: type: git url: https://github.com/ros-controls/ros2_control_demos.git diff --git a/ros_controls.jazzy.repos b/ros_controls.jazzy.repos index ac85ddb6ed..d2c3a15743 100644 --- a/ros_controls.jazzy.repos +++ b/ros_controls.jazzy.repos @@ -1,24 +1,8 @@ repositories: - ros-controls/control_msgs: - type: git - url: https://github.com/ros-controls/control_msgs.git - version: master - ros-controls/control_toolbox: - 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: jazzy - ros-controls/kinematics_interface: - type: git - url: https://github.com/ros-controls/kinematics_interface.git - version: master - ros-controls/realtime_tools: - type: git - url: https://github.com/ros-controls/realtime_tools.git - version: master ros-controls/ros2_control_demos: type: git url: https://github.com/ros-controls/ros2_control_demos.git diff --git a/ros_controls.rolling.repos b/ros_controls.rolling.repos index 1edd707053..45d6fe6040 100644 --- a/ros_controls.rolling.repos +++ b/ros_controls.rolling.repos @@ -1,24 +1,8 @@ repositories: - ros-controls/control_msgs: - type: git - url: https://github.com/ros-controls/control_msgs.git - version: master - ros-controls/control_toolbox: - 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: rolling - ros-controls/kinematics_interface: - type: git - url: https://github.com/ros-controls/kinematics_interface.git - version: master - ros-controls/realtime_tools: - type: git - url: https://github.com/ros-controls/realtime_tools.git - version: master ros-controls/ros2_control_demos: type: git url: https://github.com/ros-controls/ros2_control_demos.git From e8fafb4086481c632b290f056cae27786e49caa9 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Tue, 10 Dec 2024 20:27:50 +0000 Subject: [PATCH 4/7] Fix path filters --- .github/workflows/humble-semi-binary-downstream-build.yml | 4 ++-- .github/workflows/jazzy-semi-binary-downstream-build.yml | 4 ++-- .github/workflows/rolling-semi-binary-downstream-build.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/humble-semi-binary-downstream-build.yml b/.github/workflows/humble-semi-binary-downstream-build.yml index 8a15cb4d3d..5b8ac967ad 100644 --- a/.github/workflows/humble-semi-binary-downstream-build.yml +++ b/.github/workflows/humble-semi-binary-downstream-build.yml @@ -13,7 +13,7 @@ on: - '**.cpp' - '**.py' - '**.yaml' - - '.github/workflows/humble-binary-downstream-build.yml' + - '.github/workflows/humble-semi-binary-downstream-build.yml' - '**/package.xml' - '**/CMakeLists.txt' - 'ros_controls.humble.repos' @@ -26,7 +26,7 @@ on: - '**.cpp' - '**.py' - '**.yaml' - - '.github/workflows/humble-binary-downstream-build.yml' + - '.github/workflows/humble-semi-binary-downstream-build.yml' - '**/package.xml' - '**/CMakeLists.txt' - 'ros_controls.humble.repos' diff --git a/.github/workflows/jazzy-semi-binary-downstream-build.yml b/.github/workflows/jazzy-semi-binary-downstream-build.yml index c376e9a22d..3855499c5b 100644 --- a/.github/workflows/jazzy-semi-binary-downstream-build.yml +++ b/.github/workflows/jazzy-semi-binary-downstream-build.yml @@ -13,7 +13,7 @@ on: - '**.cpp' - '**.py' - '**.yaml' - - '.github/workflows/jazzy-binary-downstream-build.yml' + - '.github/workflows/jazzy-semi-binary-downstream-build.yml' - '**/package.xml' - '**/CMakeLists.txt' - 'ros_controls.jazzy.repos' @@ -26,7 +26,7 @@ on: - '**.cpp' - '**.py' - '**.yaml' - - '.github/workflows/jazzy-binary-downstream-build.yml' + - '.github/workflows/jazzy-semi-binary-downstream-build.yml' - '**/package.xml' - '**/CMakeLists.txt' - 'ros_controls.jazzy.repos' diff --git a/.github/workflows/rolling-semi-binary-downstream-build.yml b/.github/workflows/rolling-semi-binary-downstream-build.yml index fe0d447cce..e11aab0274 100644 --- a/.github/workflows/rolling-semi-binary-downstream-build.yml +++ b/.github/workflows/rolling-semi-binary-downstream-build.yml @@ -13,7 +13,7 @@ on: - '**.cpp' - '**.py' - '**.yaml' - - '.github/workflows/rolling-binary-downstream-build.yml' + - '.github/workflows/rolling-semi-binary-downstream-build.yml' - '**/package.xml' - '**/CMakeLists.txt' - 'ros_controls.rolling.repos' @@ -26,7 +26,7 @@ on: - '**.cpp' - '**.py' - '**.yaml' - - '.github/workflows/rolling-binary-downstream-build.yml' + - '.github/workflows/rolling-semi-binary-downstream-build.yml' - '**/package.xml' - '**/CMakeLists.txt' - 'ros_controls.rolling.repos' From f5f76a00df4b78a0bdc15193bc5e559bf0c79d66 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 11 Dec 2024 13:38:33 +0000 Subject: [PATCH 5/7] Remove push triggers --- .../humble-semi-binary-downstream-build.yml | 16 +--------------- .../jazzy-semi-binary-downstream-build.yml | 16 +--------------- .../rolling-semi-binary-downstream-build.yml | 16 +--------------- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/.github/workflows/humble-semi-binary-downstream-build.yml b/.github/workflows/humble-semi-binary-downstream-build.yml index 5b8ac967ad..5f3f4bd711 100644 --- a/.github/workflows/humble-semi-binary-downstream-build.yml +++ b/.github/workflows/humble-semi-binary-downstream-build.yml @@ -17,24 +17,10 @@ on: - '**/package.xml' - '**/CMakeLists.txt' - 'ros_controls.humble.repos' - push: - branches: - - humble - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '**.yaml' - - '.github/workflows/humble-semi-binary-downstream-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros_controls.humble.repos' concurrency: - # cancel previous runs of the same workflow, except for pushes on humble branch group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }} + cancel-in-progress: true jobs: build-downstream: diff --git a/.github/workflows/jazzy-semi-binary-downstream-build.yml b/.github/workflows/jazzy-semi-binary-downstream-build.yml index 3855499c5b..3f18814af3 100644 --- a/.github/workflows/jazzy-semi-binary-downstream-build.yml +++ b/.github/workflows/jazzy-semi-binary-downstream-build.yml @@ -17,24 +17,10 @@ on: - '**/package.xml' - '**/CMakeLists.txt' - 'ros_controls.jazzy.repos' - push: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '**.yaml' - - '.github/workflows/jazzy-semi-binary-downstream-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros_controls.jazzy.repos' concurrency: - # cancel previous runs of the same workflow, except for pushes on master branch group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }} + cancel-in-progress: true jobs: build-downstream: diff --git a/.github/workflows/rolling-semi-binary-downstream-build.yml b/.github/workflows/rolling-semi-binary-downstream-build.yml index e11aab0274..9163be6778 100644 --- a/.github/workflows/rolling-semi-binary-downstream-build.yml +++ b/.github/workflows/rolling-semi-binary-downstream-build.yml @@ -17,24 +17,10 @@ on: - '**/package.xml' - '**/CMakeLists.txt' - 'ros_controls.rolling.repos' - push: - branches: - - master - paths: - - '**.hpp' - - '**.h' - - '**.cpp' - - '**.py' - - '**.yaml' - - '.github/workflows/rolling-semi-binary-downstream-build.yml' - - '**/package.xml' - - '**/CMakeLists.txt' - - 'ros_controls.rolling.repos' concurrency: - # cancel previous runs of the same workflow, except for pushes on master branch group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }} + cancel-in-progress: true jobs: build-downstream: From c1f90a52a8f233e499a472346234b03b18e84e4d Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 11 Dec 2024 13:40:11 +0000 Subject: [PATCH 6/7] Add some 3rd party packages to test --- .../humble-semi-binary-downstream-build.yml | 18 +++++++++++++-- .../jazzy-semi-binary-downstream-build.yml | 16 ++++++++++++- .../rolling-semi-binary-downstream-build.yml | 23 ++++++++++++++++--- downstream.humble.repos | 13 +++++++++++ downstream.jazzy.repos | 13 +++++++++++ downstream.rolling.repos | 13 +++++++++++ 6 files changed, 90 insertions(+), 6 deletions(-) create mode 100644 downstream.humble.repos create mode 100644 downstream.jazzy.repos create mode 100644 downstream.rolling.repos diff --git a/.github/workflows/humble-semi-binary-downstream-build.yml b/.github/workflows/humble-semi-binary-downstream-build.yml index 5f3f4bd711..f0bc3a9fd2 100644 --- a/.github/workflows/humble-semi-binary-downstream-build.yml +++ b/.github/workflows/humble-semi-binary-downstream-build.yml @@ -28,8 +28,22 @@ jobs: with: ros_distro: humble ros_repo: testing - ref_for_scheduled_build: master - not_test_build: true + ref_for_scheduled_build: humble upstream_workspace: ros2_control.humble.repos + # we don't test this repository, we just build it + not_test_build: true + # we test the downstream packages, which are part of our organization downstream_workspace: ros_controls.humble.repos + not_test_downstream: false + build-downstream-3rd-party: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + with: + ros_distro: humble + ros_repo: testing + ref_for_scheduled_build: humble + upstream_workspace: ros2_control.humble.repos + # we don't test this repository, we just build it + not_test_build: true + # we don't test the downstream packages, which are outside of our organization + downstream_workspace: downstream.humble.repos not_test_downstream: true diff --git a/.github/workflows/jazzy-semi-binary-downstream-build.yml b/.github/workflows/jazzy-semi-binary-downstream-build.yml index 3f18814af3..3bcf417887 100644 --- a/.github/workflows/jazzy-semi-binary-downstream-build.yml +++ b/.github/workflows/jazzy-semi-binary-downstream-build.yml @@ -29,7 +29,21 @@ jobs: ros_distro: jazzy ros_repo: testing ref_for_scheduled_build: master - not_test_build: true upstream_workspace: ros2_control.jazzy.repos + # we don't test this repository, we just build it + not_test_build: true + # we test the downstream packages, which are part of our organization downstream_workspace: ros_controls.jazzy.repos + not_test_downstream: false + build-downstream-3rd-party: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + with: + ros_distro: jazzy + ros_repo: testing + ref_for_scheduled_build: master + upstream_workspace: ros2_control.jazzy.repos + # we don't test this repository, we just build it + not_test_build: true + # we don't test the downstream packages, which are outside of our organization + downstream_workspace: downstream.jazzy.repos not_test_downstream: true diff --git a/.github/workflows/rolling-semi-binary-downstream-build.yml b/.github/workflows/rolling-semi-binary-downstream-build.yml index 9163be6778..318110eb54 100644 --- a/.github/workflows/rolling-semi-binary-downstream-build.yml +++ b/.github/workflows/rolling-semi-binary-downstream-build.yml @@ -29,12 +29,29 @@ jobs: fail-fast: false matrix: ROS_DISTRO: [rolling] - ROS_REPO: [testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} - ros_repo: ${{ matrix.ROS_REPO }} + ros_repo: testing ref_for_scheduled_build: master + upstream_workspace: ros2_controll.${{ matrix.ROS_DISTRO }}.repos + # we don't test this repository, we just build it not_test_build: true - upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos + # we test the downstream packages, which are part of our organization downstream_workspace: ros_controls.${{ matrix.ROS_DISTRO }}.repos + not_test_downstream: false + build-downstream-3rd-party: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + strategy: + fail-fast: false + matrix: + ROS_DISTRO: [rolling] + with: + ros_distro: ${{ matrix.ROS_DISTRO }} + ros_repo: testing + ref_for_scheduled_build: master + upstream_workspace: ros2_controll.${{ matrix.ROS_DISTRO }}.repos + # we don't test this repository, we just build it + not_test_build: true + # we don't test the downstream packages, which are outside of our organization + downstream_workspace: downstream.${{ matrix.ROS_DISTRO }}.repos not_test_downstream: true diff --git a/downstream.humble.repos b/downstream.humble.repos new file mode 100644 index 0000000000..d4ee6ec81a --- /dev/null +++ b/downstream.humble.repos @@ -0,0 +1,13 @@ +repositories: + UniversalRobots/Universal_Robots_ROS2_Driver: + type: git + url: https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver.git + version: humble + webots/webots_ros2: + type: git + url: https://github.com/cyberbotics/webots_ros2.git + version: master + PickNikRobotics/topic_based_ros2_control: + type: git + url: https://github.com/PickNikRobotics/topic_based_ros2_control.git + version: main diff --git a/downstream.jazzy.repos b/downstream.jazzy.repos new file mode 100644 index 0000000000..13f06e7b44 --- /dev/null +++ b/downstream.jazzy.repos @@ -0,0 +1,13 @@ +repositories: + UniversalRobots/Universal_Robots_ROS2_Driver: + type: git + url: https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver.git + version: main + webots/webots_ros2: + type: git + url: https://github.com/cyberbotics/webots_ros2.git + version: master + PickNikRobotics/topic_based_ros2_control: + type: git + url: https://github.com/PickNikRobotics/topic_based_ros2_control.git + version: main diff --git a/downstream.rolling.repos b/downstream.rolling.repos new file mode 100644 index 0000000000..13f06e7b44 --- /dev/null +++ b/downstream.rolling.repos @@ -0,0 +1,13 @@ +repositories: + UniversalRobots/Universal_Robots_ROS2_Driver: + type: git + url: https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver.git + version: main + webots/webots_ros2: + type: git + url: https://github.com/cyberbotics/webots_ros2.git + version: master + PickNikRobotics/topic_based_ros2_control: + type: git + url: https://github.com/PickNikRobotics/topic_based_ros2_control.git + version: main From cda7d5b5eddd878c06af73944672d62addb2727a Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 11 Dec 2024 13:45:17 +0000 Subject: [PATCH 7/7] Fix typo --- .github/workflows/rolling-semi-binary-downstream-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rolling-semi-binary-downstream-build.yml b/.github/workflows/rolling-semi-binary-downstream-build.yml index 318110eb54..57db2ae7ba 100644 --- a/.github/workflows/rolling-semi-binary-downstream-build.yml +++ b/.github/workflows/rolling-semi-binary-downstream-build.yml @@ -33,7 +33,7 @@ jobs: ros_distro: ${{ matrix.ROS_DISTRO }} ros_repo: testing ref_for_scheduled_build: master - upstream_workspace: ros2_controll.${{ matrix.ROS_DISTRO }}.repos + upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos # we don't test this repository, we just build it not_test_build: true # we test the downstream packages, which are part of our organization @@ -49,7 +49,7 @@ jobs: ros_distro: ${{ matrix.ROS_DISTRO }} ros_repo: testing ref_for_scheduled_build: master - upstream_workspace: ros2_controll.${{ matrix.ROS_DISTRO }}.repos + upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos # we don't test this repository, we just build it not_test_build: true # we don't test the downstream packages, which are outside of our organization