Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable 24.04 CI on harmonic #590

Merged
merged 2 commits into from
May 2, 2024
Merged

Enable 24.04 CI on harmonic #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04e3669
Enable 24.04 CI on harmonic
scpeters May 2, 2024
355780f
Delete .github/ci/packages-jammy.apt
scpeters May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/ci/packages-focal.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-distutils
1 change: 0 additions & 1 deletion .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ libeigen3-dev
libgz-cmake3-dev
libgz-utils2-dev
libpython3-dev
python3-distutils
python3-pybind11
python3-pytest
ruby-dev
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 1 addition & 5 deletions src/ruby/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down