From ed34d9ca1501f63be131bc551afe35169f9a5364 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Sat, 14 Mar 2026 18:39:51 +0100 Subject: [PATCH 1/7] Modify Docker images and ROS distributions in test.yml Updated supported Docker images and ROS distributions in the CI workflow. Signed-off-by: mosfet80 --- .github/workflows/test.yml | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4577cb5fa..1886c8e42 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -44,11 +44,10 @@ jobs: fail-fast: false matrix: docker_image: - - ubuntu:20.04 - ubuntu:22.04 - ubuntu:24.04 - - almalinux:8 - almalinux:9 + - almalinux:10 steps: - uses: actions/checkout@v6 - uses: actions/setup-node@v6.1.0 @@ -74,8 +73,6 @@ jobs: ros_distribution: # Humble Hawksbill (May 2022 - May 2027) - humble - # Iron Irwini (May 2023 - November 2024) - - iron # Jazzy Jalisco (May 2024 - May 2029) - jazzy # Kilted Kaiju (May 2025 - November 2026) @@ -110,25 +107,16 @@ jobs: # # Platforms are defined in REP 3: https://ros.org/reps/rep-0003.html include: - # Noetic Ninjemys (May 2020 - May 2025) - - docker_image: ubuntu:focal - ros_distribution: noetic - ros_version: 1 # Humble Hawksbill (May 2022 - May 2027) - docker_image: ubuntu:jammy ros_distribution: humble ros_version: 2 - - docker_image: almalinux:8 + - docker_image: almalinux:9 ros_distribution: humble ros_version: 2 - # Iron Irwini (May 2023 - November 2024) - - docker_image: ubuntu:jammy - ros_distribution: iron - ros_version: 2 - # Jazzy Jalisco (May 2024 - May 2029) - docker_image: ubuntu:noble ros_distribution: jazzy @@ -152,7 +140,7 @@ jobs: ros_distribution: rolling ros_version: 2 - - docker_image: almalinux:9 + - docker_image: almalinux:10 ros_distribution: rolling ros_version: 2 @@ -170,8 +158,6 @@ jobs: with: required-ros-distributions: ${{ matrix.ros_distribution }} - run: .github/workflows/check-environment.sh - - run: .github/workflows/check-ros-distribution.sh "${{ matrix.ros_distribution }}" - if: matrix.ros_version == 1 - run: .github/workflows/check-ros2-distribution.sh "${{ matrix.ros_distribution }}" if: matrix.ros_version == 2 From 7dbb22ddde567a631fec50444cb94c36eb4b28a8 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Sat, 14 Mar 2026 18:42:06 +0100 Subject: [PATCH 2/7] Delete .github/workflows/check-ros-distribution.sh Signed-off-by: mosfet80 --- .github/workflows/check-ros-distribution.sh | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100755 .github/workflows/check-ros-distribution.sh diff --git a/.github/workflows/check-ros-distribution.sh b/.github/workflows/check-ros-distribution.sh deleted file mode 100755 index c8715133c..000000000 --- a/.github/workflows/check-ros-distribution.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -# -# ./check-ros-distribution.sh -# ROS distribution must match the directory name for this distribution -# in /opt. E.g. melodic. - -readonly ROS_DISTRIBUTION="$1" - -# GitHub Action is erroneously setting PYTHONHOME to C:\python37 -unset PYTHONHOME -source "/opt/ros/${ROS_DISTRIBUTION}/setup.bash" -rosstack list From 473ba244e04d50555148edc9ef29bbc26e0b098b Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Sat, 14 Mar 2026 18:47:16 +0100 Subject: [PATCH 3/7] Update allowed ROS distributions in action.yml Removed 'noetic' and 'iron' from allowed ROS distributions. Signed-off-by: mosfet80 --- action.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/action.yml b/action.yml index 818375856..93ab7683c 100644 --- a/action.yml +++ b/action.yml @@ -26,9 +26,7 @@ inputs: Allowed ROS distributions - "" (no value) - no ROS binary installation - - noetic - humble - - iron - jazzy - kilted - rolling From 587831158088b9853b68b9f5888ba70aa8ad61f8 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Sun, 17 May 2026 21:58:14 +0200 Subject: [PATCH 4/7] Update test.yml --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1886c8e42..8c0075bf4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -158,6 +158,8 @@ jobs: with: required-ros-distributions: ${{ matrix.ros_distribution }} - run: .github/workflows/check-environment.sh + - run: .github/workflows/check-ros-distribution.sh "${{ matrix.ros_distribution }}" + if: matrix.ros_version == 1 - run: .github/workflows/check-ros2-distribution.sh "${{ matrix.ros_distribution }}" if: matrix.ros_version == 2 From 05c35d37d5069ae1ecbcb859c31ec385f7286a1d Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Sun, 17 May 2026 22:00:42 +0200 Subject: [PATCH 5/7] Add Ubuntu 26.04 to test workflow matrix --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 003a5feee..60054b71a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,6 +46,7 @@ jobs: docker_image: - ubuntu:22.04 - ubuntu:24.04 + - ubuntu:26.04 - almalinux:9 - almalinux:10 steps: From 4640a6b86d2d501663ae9f4a5428c1d4207c81b1 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sun, 17 May 2026 15:39:54 -0700 Subject: [PATCH 6/7] Apply suggestion from @christophebedard --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 60054b71a..7ed237481 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -118,7 +118,7 @@ jobs: ros_distribution: humble ros_version: 2 - - docker_image: almalinux:9 + - docker_image: almalinux:8 ros_distribution: humble ros_version: 2 From 3bb2fef0d18faa34eb045a28daf42ecc2ee31f21 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sun, 17 May 2026 15:47:36 -0700 Subject: [PATCH 7/7] Add almalinux:8 back since Humble targets it Signed-off-by: Christophe Bedard --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7ed237481..4fa6d1609 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,6 +47,7 @@ jobs: - ubuntu:22.04 - ubuntu:24.04 - ubuntu:26.04 + - almalinux:8 - almalinux:9 - almalinux:10 steps: