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.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