Merge branch 'master' into feature/steering_controllers_library_wait_…

…steering
ros-controls · Nov 22, 2024 · 2de1d31 · 2de1d31
2 parents 4a35d46 + 1bd6870
commit 2de1d31
Show file tree

Hide file tree

Showing 168 changed files with 7,130 additions and 588 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -18,10 +18,3 @@ updates:
     schedule:
       interval: "weekly"
     target-branch: "humble"
-  - package-ecosystem: "github-actions"
-    # Workflow files stored in the
-    # default location of `.github/workflows`
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    target-branch: "iron"
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -8,15 +8,6 @@ pull_request_rules:
         branches:
           - humble
 
-  - name: Backport to iron at reviewers discretion
-    conditions:
-      - base=master
-      - "label=backport-iron"
-    actions:
-      backport:
-        branches:
-          - iron
-
   - name: Ask to resolve conflict
     conditions:
       - conflict

diff --git a/.github/workflows/humble-semi-binary-build.yml b/.github/workflows/humble-semi-binary-build.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_REPO: [main, testing]
+        ROS_REPO: [testing]
     with:
       ros_distro: humble
       ros_repo: ${{ matrix.ROS_REPO }}

diff --git a/.github/workflows/iron-abi-compatibility.yml b/.github/workflows/iron-abi-compatibility.yml
diff --git a/.github/workflows/iron-binary-build.yml b/.github/workflows/iron-binary-build.yml
diff --git a/.github/workflows/iron-check-docs.yml b/.github/workflows/iron-check-docs.yml
diff --git a/.github/workflows/iron-coverage-build.yml b/.github/workflows/iron-coverage-build.yml
diff --git a/.github/workflows/iron-debian-build.yml b/.github/workflows/iron-debian-build.yml
diff --git a/.github/workflows/iron-pre-commit.yml b/.github/workflows/iron-pre-commit.yml
diff --git a/.github/workflows/iron-rhel-semi-binary-build.yml b/.github/workflows/iron-rhel-semi-binary-build.yml
diff --git a/.github/workflows/iron-semi-binary-build.yml b/.github/workflows/iron-semi-binary-build.yml
diff --git a/.github/workflows/iron-source-build.yml b/.github/workflows/iron-source-build.yml
diff --git a/.github/workflows/jazzy-semi-binary-build.yml b/.github/workflows/jazzy-semi-binary-build.yml
@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_REPO: [main, testing]
+        ROS_REPO: [testing]
     with:
       ros_distro: jazzy
       ros_repo: ${{ matrix.ROS_REPO }}

diff --git a/.github/workflows/rolling-compatibility-humble-binary-build.yml b/.github/workflows/rolling-compatibility-humble-binary-build.yml
@@ -0,0 +1,48 @@
+name: Check Rolling Compatibility on Humble
+# author: Christoph Froehlich <[email protected]>
+# description: 'Build & test the rolling version on Humble distro.'
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - master
+      - '*feature*'
+      - '*feature/**'
+    paths:
+      - '**.hpp'
+      - '**.h'
+      - '**.cpp'
+      - '**.py'
+      - '**.yaml'
+      - '.github/workflows/rolling-compatibility-humble-binary-build.yml'
+      - '**/package.xml'
+      - '**/CMakeLists.txt'
+      - 'ros2_controllers.rolling.repos'
+  push:
+    branches:
+      - master
+    paths:
+      - '**.hpp'
+      - '**.h'
+      - '**.cpp'
+      - '**.py'
+      - '**.yaml'
+      - '.github/workflows/rolling-compatibility-humble-binary-build.yml'
+      - '**/package.xml'
+      - '**/CMakeLists.txt'
+      - 'ros2_controllers.rolling.repos'
+
+jobs:
+  build-on-humble:
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
+    strategy:
+      fail-fast: false
+      matrix:
+        ROS_DISTRO: [humble]
+        ROS_REPO: [testing]
+    with:
+      ros_distro: ${{ matrix.ROS_DISTRO }}
+      ros_repo: ${{ matrix.ROS_REPO }}
+      upstream_workspace: ros2_controllers.rolling.repos
+      ref_for_scheduled_build: master