Skip to content

Commit d55cec0

Browse files
authored
Merge pull request #21 from nim65s/ros
ROS: fix nanobind
2 parents 57b5d84 + 81a1558 commit d55cec0

File tree

6 files changed

+65
-7
lines changed

6 files changed

+65
-7
lines changed

.github/workflows/ros_ci.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
2+
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)
3+
4+
name: CI - Linux via ROS
5+
6+
# This determines when this workflow is run
7+
on:
8+
push:
9+
paths-ignore:
10+
- '*.md'
11+
- 'LICENSE'
12+
- '.pre-commit-config.yaml'
13+
pull_request:
14+
paths-ignore:
15+
- '*.md'
16+
- 'LICENSE'
17+
- '.pre-commit-config.yaml'
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
22+
jobs:
23+
CI:
24+
strategy:
25+
matrix:
26+
env:
27+
- {ROS_DISTRO: humble}
28+
- {ROS_DISTRO: jazzy}
29+
- {ROS_DISTRO: kilted}
30+
- {ROS_DISTRO: rolling}
31+
env:
32+
# PRERELEASE: true # Fails due to issues in the underlying Docker image
33+
BUILDER: colcon
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/checkout@v4
37+
with:
38+
submodules: recursive
39+
# Run industrial_ci
40+
- uses: 'ros-industrial/industrial_ci@e3d16c224caf4832cf68e74093eb70f3a979b4cc'
41+
env: ${{ matrix.env }}
42+
43+
check:
44+
if: always()
45+
name: check-ros-ci
46+
47+
needs:
48+
- CI
49+
50+
runs-on: Ubuntu-latest
51+
52+
steps:
53+
- name: Decide whether the needed jobs succeeded or failed
54+
uses: re-actors/alls-green@release/v1
55+
with:
56+
jobs: ${{ toJSON(needs) }}

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "cmake"]
22
path = cmake
33
url = https://github.com/jrl-umi3218/jrl-cmakemodules.git
4+
[submodule "ext/nanobind"]
5+
path = ext/nanobind
6+
url = https://github.com/wjakob/nanobind

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ execute_process(
112112
OUTPUT_STRIP_TRAILING_WHITESPACE
113113
OUTPUT_VARIABLE nanobind_ROOT
114114
)
115-
find_package(nanobind CONFIG REQUIRED)
115+
find_package(nanobind 2.5.0 CONFIG)
116+
if(NOT nanobind_FOUND)
117+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/nanobind)
118+
endif()
116119

117120
# Setup main targets
118121
file(
@@ -242,7 +245,4 @@ install(
242245
ADD_HEADER_GROUP(${PROJECT_NAME}_HEADERS)
243246
ADD_SOURCE_GROUP(${PROJECT_NAME}_SOURCES)
244247

245-
# Install ROS package.xml
246-
install(FILES package.xml DESTINATION share/${PROJECT_NAME})
247-
248248
SETUP_PROJECT_FINALIZE()

cmake

Submodule cmake updated 1 file

ext/nanobind

Submodule nanobind added at 879bca4

package.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
<build_depend>doxygen</build_depend>
1515

1616
<!-- The following tag is recommended by REP-136 -->
17-
<exec_depend condition="$ROS_VERSION == 1">catkin</exec_depend>
18-
1917
<depend condition="$ROS_PYTHON_VERSION == 3">python3</depend>
2018
<depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</depend>
2119
<depend condition="$ROS_PYTHON_VERSION == 3">python3-scipy</depend>

0 commit comments

Comments
 (0)