From 04e36695957d9f1a7646ef5333e8b8019368a8b7 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Wed, 1 May 2024 17:23:07 -0700
Subject: [PATCH 1/2] Enable 24.04 CI on harmonic

* Don't install python3-distutils on 24.04
* Remove old ruby cmake code

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 .github/ci/packages-focal.apt | 1 +
 .github/ci/packages-jammy.apt | 1 +
 .github/ci/packages.apt       | 1 -
 .github/workflows/ci.yml      | 9 +++++++++
 src/ruby/CMakeLists.txt       | 6 +-----
 5 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 .github/ci/packages-focal.apt
 create mode 100644 .github/ci/packages-jammy.apt

diff --git a/.github/ci/packages-focal.apt b/.github/ci/packages-focal.apt
new file mode 100644
index 000000000..874054953
--- /dev/null
+++ b/.github/ci/packages-focal.apt
@@ -0,0 +1 @@
+python3-distutils
diff --git a/.github/ci/packages-jammy.apt b/.github/ci/packages-jammy.apt
new file mode 100644
index 000000000..874054953
--- /dev/null
+++ b/.github/ci/packages-jammy.apt
@@ -0,0 +1 @@
+python3-distutils
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
index 09f6e9c5b..87b3bbd58 100644
--- a/.github/ci/packages.apt
+++ b/.github/ci/packages.apt
@@ -2,7 +2,6 @@ libeigen3-dev
 libgz-cmake3-dev
 libgz-utils2-dev
 libpython3-dev
-python3-distutils
 python3-pybind11
 python3-pytest
 ruby-dev
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 932726d5e..93ceece00 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,3 +32,12 @@ jobs:
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@jammy
+  noble-ci:
+    runs-on: ubuntu-latest
+    name: Ubuntu Noble CI
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Compile and test
+        id: ci
+        uses: gazebo-tooling/action-gz-ci@noble
diff --git a/src/ruby/CMakeLists.txt b/src/ruby/CMakeLists.txt
index 8ad32202b..7c541051d 100644
--- a/src/ruby/CMakeLists.txt
+++ b/src/ruby/CMakeLists.txt
@@ -44,11 +44,7 @@ if (RUBY_FOUND)
 
   # Create the ruby library
   set(CMAKE_SWIG_OUTDIR "${CMAKE_BINARY_DIR}/lib/ruby")
-  if(CMAKE_VERSION VERSION_GREATER 3.8.0)
-    SWIG_ADD_LIBRARY(${SWIG_RB_LIB} LANGUAGE ruby SOURCES ruby.i ${swig_i_files})
-  else()
-    SWIG_ADD_MODULE(${SWIG_RB_LIB} ruby ruby.i ${swig_i_files})
-  endif()
+  SWIG_ADD_LIBRARY(${SWIG_RB_LIB} LANGUAGE ruby SOURCES ruby.i ${swig_i_files})
 
   # Suppress warnings on SWIG-generated files
   target_compile_options(${SWIG_RB_LIB} PRIVATE

From 355780f8dd2fa40ec3d16c377b655406f84d1181 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 2 May 2024 09:29:56 -0700
Subject: [PATCH 2/2] Delete .github/ci/packages-jammy.apt

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 .github/ci/packages-jammy.apt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .github/ci/packages-jammy.apt

diff --git a/.github/ci/packages-jammy.apt b/.github/ci/packages-jammy.apt
deleted file mode 100644
index 874054953..000000000
--- a/.github/ci/packages-jammy.apt
+++ /dev/null
@@ -1 +0,0 @@
-python3-distutils