Skip to content

Commit 02e37a6

Browse files
authored
Enable 24.04 CI on harmonic (#590)
* Don't install python3-distutils on 22.04, 24.04 * Remove old ruby cmake code Signed-off-by: Steve Peters <scpeters@openrobotics.org>
1 parent a76819b commit 02e37a6

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.github/ci/packages-focal.apt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python3-distutils

.github/ci/packages.apt

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ libeigen3-dev
22
libgz-cmake3-dev
33
libgz-utils2-dev
44
libpython3-dev
5-
python3-distutils
65
python3-pybind11
76
python3-pytest
87
ruby-dev

.github/workflows/ci.yml

+9
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,12 @@ jobs:
3232
- name: Compile and test
3333
id: ci
3434
uses: gazebo-tooling/action-gz-ci@jammy
35+
noble-ci:
36+
runs-on: ubuntu-latest
37+
name: Ubuntu Noble CI
38+
steps:
39+
- name: Checkout
40+
uses: actions/checkout@v4
41+
- name: Compile and test
42+
id: ci
43+
uses: gazebo-tooling/action-gz-ci@noble

src/ruby/CMakeLists.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@ if (RUBY_FOUND)
4444

4545
# Create the ruby library
4646
set(CMAKE_SWIG_OUTDIR "${CMAKE_BINARY_DIR}/lib/ruby")
47-
if(CMAKE_VERSION VERSION_GREATER 3.8.0)
48-
SWIG_ADD_LIBRARY(${SWIG_RB_LIB} LANGUAGE ruby SOURCES ruby.i ${swig_i_files})
49-
else()
50-
SWIG_ADD_MODULE(${SWIG_RB_LIB} ruby ruby.i ${swig_i_files})
51-
endif()
47+
SWIG_ADD_LIBRARY(${SWIG_RB_LIB} LANGUAGE ruby SOURCES ruby.i ${swig_i_files})
5248

5349
# Suppress warnings on SWIG-generated files
5450
target_compile_options(${SWIG_RB_LIB} PRIVATE

0 commit comments

Comments
 (0)