adopt changes similar to jazzy

Signed-off-by: Christian Henkel <[email protected]>
ros · Jun 27, 2024 · 50532e1 · 50532e1
1 parent 3483ce7
commit 50532e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -3,7 +3,7 @@ on:
   pull_request:
   push:
     branches:
-      - ros2
+      - ros2-iron
   schedule:
     # Run every week at 20:00 on Sunday
     - cron: "0 20 * * 0"
@@ -22,13 +22,17 @@ jobs:
             uncrustify,
             xmllint,
           ]
-    runs-on: ubuntu-latest
+        include:
+          - distro: iron
+            os: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
     env:
       AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS: 1
     steps:
       - uses: actions/checkout@v1
       - uses: ros-tooling/setup-ros@master
-      - run: sudo pip install pydocstyle==6.1.1  # downgrade to fix https://github.com/ament/ament_lint/pull/428
+        with:
+          required-ros-distributions: ${{ matrix.distro }}
       - uses: ros-tooling/action-ros-lint@master
         with:
           linter: ${{ matrix.linter }}

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -27,6 +27,8 @@ jobs:
     container: ubuntu:${{ matrix.os }}
     steps:
       - uses: ros-tooling/setup-ros@master
+        with:
+          required-ros-distributions: ${{ matrix.distro }}
       - uses: ros-tooling/action-ros-ci@master
         with:
           target-ros2-distro: ${{ matrix.distro }}