Enable 24.04 CI on harmonic

* Don't install python3-distutils on 24.04 * Remove old ruby cmake code Signed-off-by: Steve Peters <[email protected]>
gazebosim · May 2, 2024 · 04e3669 · 04e3669
1 parent a76819b
commit 04e3669
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/.github/ci/packages-focal.apt 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
@@ -0,0 +1 @@
+python3-distutils
diff --git 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
@@ -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
@@ -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