From 20b88f02c903e180ca510bfac29ea5fc9cc36cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 29 Jul 2026 13:03:25 +0200 Subject: [PATCH 1/2] Fix branch filters for PRs from a feature branch (#2496) (cherry picked from commit 5e2efbb321e921931089d97354742273011ef99f) # Conflicts: # .github/workflows/rolling-coverage-build.yml # .github/workflows/rolling-debian-build.yml # .github/workflows/rolling-rhel-semi-binary-build.yml # .github/workflows/rolling-semi-binary-build-win.yml --- .github/workflows/rolling-binary-build.yml | 9 ++++++--- .../rolling-compatibility-humble-binary-build.yml | 9 ++++++--- .../rolling-compatibility-jazzy-binary-build.yml | 9 ++++++--- .../rolling-compatibility-kilted-binary-build.yml | 9 ++++++--- .../rolling-compatibility-lyrical-binary-build.yml | 9 ++++++--- .github/workflows/rolling-coverage-build.yml | 13 +++++++++++-- .github/workflows/rolling-debian-build.yml | 13 +++++++++++-- .../workflows/rolling-rhel-semi-binary-build.yml | 13 +++++++++++-- .github/workflows/rolling-semi-binary-build-win.yml | 13 +++++++++++-- .github/workflows/rolling-semi-binary-build.yml | 9 ++++++--- 10 files changed, 80 insertions(+), 26 deletions(-) diff --git a/.github/workflows/rolling-binary-build.yml b/.github/workflows/rolling-binary-build.yml index 1641481762..c8f5ff1a73 100644 --- a/.github/workflows/rolling-binary-build.yml +++ b/.github/workflows/rolling-binary-build.yml @@ -4,12 +4,12 @@ name: Rolling Binary Build on: workflow_dispatch: - pull_request: &event + pull_request: branches: - master - '*feature*' - '*feature/**' - paths: + paths: &paths - '**.hpp' - '**.h' - '**.cpp' @@ -21,7 +21,10 @@ on: - 'ros2_controllers-not-released.rolling.repos' - 'ros2_controllers-not-released.lyrical.repos' - '**.xml' - push: *event + push: + branches: + - master + paths: *paths schedule: # Run every morning to detect flakiness and broken dependencies - cron: '03 1 * * MON-FRI' diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml index f7884cf804..99023f1f21 100644 --- a/.github/workflows/rolling-compatibility-humble-binary-build.yml +++ b/.github/workflows/rolling-compatibility-humble-binary-build.yml @@ -4,12 +4,12 @@ name: Check Rolling Compatibility on Humble on: workflow_dispatch: - pull_request: &event + pull_request: branches: - master - '*feature*' - '*feature/**' - paths: + paths: &paths - '**.hpp' - '**.h' - '**.cpp' @@ -20,7 +20,10 @@ on: - '**/CMakeLists.txt' - 'ros2_controllers.rolling.repos' - '**.xml' - push: *event + push: + branches: + - master + paths: *paths concurrency: # cancel previous runs of the same workflow, except for pushes on given branches diff --git a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml index 9bd04e2ad0..e305d27710 100644 --- a/.github/workflows/rolling-compatibility-jazzy-binary-build.yml +++ b/.github/workflows/rolling-compatibility-jazzy-binary-build.yml @@ -4,12 +4,12 @@ name: Check Rolling Compatibility on Jazzy on: workflow_dispatch: - pull_request: &event + pull_request: branches: - master - '*feature*' - '*feature/**' - paths: + paths: &paths - '**.hpp' - '**.h' - '**.cpp' @@ -20,7 +20,10 @@ on: - '**/CMakeLists.txt' - 'ros2_controllers.rolling.repos' - '**.xml' - push: *event + push: + branches: + - master + paths: *paths concurrency: # cancel previous runs of the same workflow, except for pushes on given branches diff --git a/.github/workflows/rolling-compatibility-kilted-binary-build.yml b/.github/workflows/rolling-compatibility-kilted-binary-build.yml index 1d8c3b3bb2..c7b2eeef17 100644 --- a/.github/workflows/rolling-compatibility-kilted-binary-build.yml +++ b/.github/workflows/rolling-compatibility-kilted-binary-build.yml @@ -4,12 +4,12 @@ name: Check Rolling Compatibility on Kilted on: workflow_dispatch: - pull_request: &event + pull_request: branches: - master - '*feature*' - '*feature/**' - paths: + paths: &paths - '**.hpp' - '**.h' - '**.cpp' @@ -20,7 +20,10 @@ on: - '**/CMakeLists.txt' - 'ros2_controllers.rolling.repos' - '**.xml' - push: *event + push: + branches: + - master + paths: *paths concurrency: # cancel previous runs of the same workflow, except for pushes on given branches diff --git a/.github/workflows/rolling-compatibility-lyrical-binary-build.yml b/.github/workflows/rolling-compatibility-lyrical-binary-build.yml index 6e05bee98b..4e6334cabf 100644 --- a/.github/workflows/rolling-compatibility-lyrical-binary-build.yml +++ b/.github/workflows/rolling-compatibility-lyrical-binary-build.yml @@ -4,12 +4,12 @@ name: Check Rolling Compatibility on Lyrical on: workflow_dispatch: - pull_request: &event + pull_request: branches: - master - '*feature*' - '*feature/**' - paths: + paths: &paths - '**.hpp' - '**.h' - '**.cpp' @@ -20,7 +20,10 @@ on: - '**/CMakeLists.txt' - 'ros2_controllers.rolling.repos' - '**.xml' - push: *event + push: + branches: + - master + paths: *paths concurrency: # cancel previous runs of the same workflow, except for pushes on given branches diff --git a/.github/workflows/rolling-coverage-build.yml b/.github/workflows/rolling-coverage-build.yml index 906f710d7d..8bc926fd02 100644 --- a/.github/workflows/rolling-coverage-build.yml +++ b/.github/workflows/rolling-coverage-build.yml @@ -1,10 +1,16 @@ name: Coverage Build - Rolling on: workflow_dispatch: - pull_request: &event + pull_request: branches: - master +<<<<<<< HEAD paths: +======= + - '*feature*' + - '*feature/**' + paths: &paths +>>>>>>> 5e2efbb (Fix branch filters for PRs from a feature branch (#2496)) - '**.hpp' - '**.h' - '**.cpp' @@ -16,7 +22,10 @@ on: - '**/CMakeLists.txt' - 'ros2_controllers.rolling.repos' - '**.xml' - push: *event + push: + branches: + - master + paths: *paths concurrency: # cancel previous runs of the same workflow, except for pushes on given branches diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/rolling-debian-build.yml index 59b8b18072..f0e35be27e 100644 --- a/.github/workflows/rolling-debian-build.yml +++ b/.github/workflows/rolling-debian-build.yml @@ -1,10 +1,16 @@ name: Rolling - Debian Semi-Binary Build on: workflow_dispatch: - pull_request: &event + pull_request: branches: - master +<<<<<<< HEAD paths: +======= + - '*feature*' + - '*feature/**' + paths: &paths +>>>>>>> 5e2efbb (Fix branch filters for PRs from a feature branch (#2496)) - '**.hpp' - '**.h' - '**.cpp' @@ -16,7 +22,10 @@ on: - 'ros2_controllers.rolling.repos' - 'ros2_controllers.lyrical.repos' - '**.xml' - push: *event + push: + branches: + - master + paths: *paths concurrency: # cancel previous runs of the same workflow, except for pushes on given branches diff --git a/.github/workflows/rolling-rhel-semi-binary-build.yml b/.github/workflows/rolling-rhel-semi-binary-build.yml index e6d2ec9360..4aa8ddecb5 100644 --- a/.github/workflows/rolling-rhel-semi-binary-build.yml +++ b/.github/workflows/rolling-rhel-semi-binary-build.yml @@ -1,10 +1,16 @@ name: Rolling - RHEL Semi-Binary Build on: workflow_dispatch: - pull_request: &event + pull_request: branches: - master +<<<<<<< HEAD paths: +======= + - '*feature*' + - '*feature/**' + paths: &paths +>>>>>>> 5e2efbb (Fix branch filters for PRs from a feature branch (#2496)) - '**.hpp' - '**.h' - '**.cpp' @@ -16,7 +22,10 @@ on: - 'ros2_controllers.rolling.repos' - 'ros2_controllers.lyrical.repos' - '**.xml' - push: *event + push: + branches: + - master + paths: *paths concurrency: # cancel previous runs of the same workflow, except for pushes on given branches diff --git a/.github/workflows/rolling-semi-binary-build-win.yml b/.github/workflows/rolling-semi-binary-build-win.yml index 865f218a7c..15c44a6b7e 100644 --- a/.github/workflows/rolling-semi-binary-build-win.yml +++ b/.github/workflows/rolling-semi-binary-build-win.yml @@ -4,10 +4,16 @@ name: Rolling Windows Semi-Binary Build on: workflow_dispatch: - pull_request: &event + pull_request: branches: - master +<<<<<<< HEAD paths: +======= + - '*feature*' + - '*feature/**' + paths: &paths +>>>>>>> 5e2efbb (Fix branch filters for PRs from a feature branch (#2496)) - '**.hpp' - '**.h' - '**.cpp' @@ -16,7 +22,10 @@ on: - '**/package.xml' - '**/CMakeLists.txt' - 'ros2_controllers.rolling.repos' - push: *event + push: + branches: + - master + paths: *paths concurrency: # cancel previous runs of the same workflow, except for pushes on given branches diff --git a/.github/workflows/rolling-semi-binary-build.yml b/.github/workflows/rolling-semi-binary-build.yml index 2555b53aa0..2d8054959e 100644 --- a/.github/workflows/rolling-semi-binary-build.yml +++ b/.github/workflows/rolling-semi-binary-build.yml @@ -3,12 +3,12 @@ name: Rolling Semi-Binary Build on: workflow_dispatch: - pull_request: &event + pull_request: branches: - master - '*feature*' - '*feature/**' - paths: + paths: &paths - '**.hpp' - '**.h' - '**.cpp' @@ -20,7 +20,10 @@ on: - 'ros2_controllers.rolling.repos' - 'ros2_controllers.lyrical.repos' - '**.xml' - push: *event + push: + branches: + - master + paths: *paths schedule: # Run every morning to detect flakiness and broken dependencies - cron: '33 1 * * MON-FRI' From 62f6c9558cc9ec09ce455099f8996950a6e7d53e Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Wed, 29 Jul 2026 11:04:48 +0000 Subject: [PATCH 2/2] Fix merge conflict --- .github/workflows/rolling-coverage-build.yml | 4 ---- .github/workflows/rolling-debian-build.yml | 4 ---- .github/workflows/rolling-rhel-semi-binary-build.yml | 4 ---- .github/workflows/rolling-semi-binary-build-win.yml | 4 ---- 4 files changed, 16 deletions(-) diff --git a/.github/workflows/rolling-coverage-build.yml b/.github/workflows/rolling-coverage-build.yml index 8bc926fd02..a018c3b891 100644 --- a/.github/workflows/rolling-coverage-build.yml +++ b/.github/workflows/rolling-coverage-build.yml @@ -4,13 +4,9 @@ on: pull_request: branches: - master -<<<<<<< HEAD - paths: -======= - '*feature*' - '*feature/**' paths: &paths ->>>>>>> 5e2efbb (Fix branch filters for PRs from a feature branch (#2496)) - '**.hpp' - '**.h' - '**.cpp' diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/rolling-debian-build.yml index f0e35be27e..30f74410e9 100644 --- a/.github/workflows/rolling-debian-build.yml +++ b/.github/workflows/rolling-debian-build.yml @@ -4,13 +4,9 @@ on: pull_request: branches: - master -<<<<<<< HEAD - paths: -======= - '*feature*' - '*feature/**' paths: &paths ->>>>>>> 5e2efbb (Fix branch filters for PRs from a feature branch (#2496)) - '**.hpp' - '**.h' - '**.cpp' diff --git a/.github/workflows/rolling-rhel-semi-binary-build.yml b/.github/workflows/rolling-rhel-semi-binary-build.yml index 4aa8ddecb5..263bd1d3a4 100644 --- a/.github/workflows/rolling-rhel-semi-binary-build.yml +++ b/.github/workflows/rolling-rhel-semi-binary-build.yml @@ -4,13 +4,9 @@ on: pull_request: branches: - master -<<<<<<< HEAD - paths: -======= - '*feature*' - '*feature/**' paths: &paths ->>>>>>> 5e2efbb (Fix branch filters for PRs from a feature branch (#2496)) - '**.hpp' - '**.h' - '**.cpp' diff --git a/.github/workflows/rolling-semi-binary-build-win.yml b/.github/workflows/rolling-semi-binary-build-win.yml index 15c44a6b7e..80a56a6386 100644 --- a/.github/workflows/rolling-semi-binary-build-win.yml +++ b/.github/workflows/rolling-semi-binary-build-win.yml @@ -7,13 +7,9 @@ on: pull_request: branches: - master -<<<<<<< HEAD - paths: -======= - '*feature*' - '*feature/**' paths: &paths ->>>>>>> 5e2efbb (Fix branch filters for PRs from a feature branch (#2496)) - '**.hpp' - '**.h' - '**.cpp'