From 514ceed132aef29ba84725c992c80e3120567fbc Mon Sep 17 00:00:00 2001
From: Wolfgang Merkt <w.merkt@gmail.com>
Date: Sat, 24 Feb 2024 05:48:46 +0000
Subject: [PATCH] [CI] ros-actions update

---
 ...nd_test.yml => ros2_ci_build_and_test.yml} | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)
 rename .github/workflows/{build_and_test.yml => ros2_ci_build_and_test.yml} (57%)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/ros2_ci_build_and_test.yml
similarity index 57%
rename from .github/workflows/build_and_test.yml
rename to .github/workflows/ros2_ci_build_and_test.yml
index 94d6390f..00284923 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/ros2_ci_build_and_test.yml
@@ -12,27 +12,27 @@ jobs:
       fail-fast: false
       matrix:
         ros_distribution:
-          - foxy
-          - galactic
+          - humble
+          - iron
           - rolling
         include:
-          # Foxy Fitzroy (June 2020 - May 2023)
-          - docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-latest
-            ros_distribution: foxy
+          # Humble Hawksbill (May 2022 - May 2027)
+          - os: ubuntu-22.04
+            ros_distribution: humble
             ros_version: 2
-          # Galactic Geochelone (May 2021 - November 2022)
-          - docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-galactic-ros-base-latest
-            ros_distribution: galactic
+          # Iron Irwini (May 2023 - November 2024)
+          - os: ubuntu-22.04
+            ros_distribution: iron
             ros_version: 2
           # Rolling Ridley  (June 2020 - Present)
-          - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
+          - os: ubuntu-22.04
             ros_distribution: rolling
             ros_version: 2
-    container:
-      image: ${{ matrix.docker_image }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.ros_distribution == 'rolling' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 2
 
@@ -42,7 +42,7 @@ jobs:
           echo ::set-output name=package_list::$(colcon list --names-only)
 
       - name: build and test
-        uses: ros-tooling/action-ros-ci@v0.2
+        uses: ros-tooling/action-ros-ci@v0.3.6
         with:
           package-name: ${{ steps.list_packages.outputs.package_list }}
           target-ros2-distro: ${{ matrix.ros_distribution }}