From b54bc2608c8cfef5860fa0e7c715d95fd3fb75f5 Mon Sep 17 00:00:00 2001
From: Jose Luis Blanco-Claraco <joseluisblancoc@gmail.com>
Date: Wed, 31 Jan 2024 02:59:25 +0100
Subject: [PATCH] update ROS version to use in CI

---
 .circleci/config.yml            | 6 +++---
 .github/workflows/build-ros.yml | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 13b01049..92434506 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,8 @@
 version: 2
 jobs:
-  ros-rolling-u22.04:
+  ros-humble-u22.04:
     docker:
-      - image: ros:rolling-ros-base
+      - image: ros:humble-ros-base
     steps:
       - checkout
       - run:
@@ -23,4 +23,4 @@ workflows:
   version: 2
   build:
     jobs:
-      - ros-rolling-u22.04
+      - ros-humble-u22.04
diff --git a/.github/workflows/build-ros.yml b/.github/workflows/build-ros.yml
index e9619dd9..eea85d73 100644
--- a/.github/workflows/build-ros.yml
+++ b/.github/workflows/build-ros.yml
@@ -13,7 +13,6 @@ jobs:
         # Github Actions requires a single row to be added to the build matrix.
         # See https://help.github.com/en/articles/workflow-syntax-for-github-actions.
         ros_distribution:
-          - noetic
           - humble
           - iron
           - rolling
@@ -27,11 +26,6 @@ jobs:
         # https://ros.org/reps/rep-0003.html
         # https://ros.org/reps/rep-2000.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