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

Add iron and humble in the CI #2097

Merged
merged 5 commits into from
Nov 29, 2023
Merged

Add iron and humble in the CI #2097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43573cd
ci/ros: add iron and humble
jcarpent Nov 25, 2023
e99bbf7
ci/ros: update commit id
jcarpent Nov 25, 2023
f3828db
Merge branch 'devel' into topic/ci/ros
jcarpent Nov 27, 2023
ef86a24
package.xml: Add ros_environment dependency
wxmerkt Nov 28, 2023
7b98fae
[CI] Use colcon apart from noetic; remove Melodic conditional depende…
wxmerkt Nov 29, 2023
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
9 changes: 5 additions & 4 deletions .github/workflows/ros-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@ jobs:
strategy:
matrix:
env:
- {ROS_DISTRO: noetic}
- {ROS_DISTRO: rolling, BUILDER: colcon}
- {ROS_DISTRO: noetic, BUILDER: catkin_tools}
- {ROS_DISTRO: rolling}
- {ROS_DISTRO: iron}
- {ROS_DISTRO: humble}
env:
CCACHE_DIR: /github/home/.ccache # Enable ccache
# The following is a work-around for ROS tooling in conjunction with jrl-cmakemodules:
# The following is a work-around for ROS1 tooling in conjunction with jrl-cmakemodules:
# - catkin_make_isolated has issues with Industrial-CI right now
# - colcon cannot find example-robot-data's python bindings due to ROS1 workspace integration hooks
# - catkin_tools correctly finds example-robot-data in the upstream_ws, but does not execute the 'run_tests' target
# as catkin-tools performs tests as '--catkin-make-args' instead of '--make-args' as colcon and catkin_make_isolated
# The work-around is thus to use catkin_tools for building and sourcing, and to manually specify execution of the test
# target after completion of the regular test target. The output of this step does affect the output of the CI process.
# Note, this does not affect projects that do not have pure CMake projects in their upstream_ws.
BUILDER: catkin_tools
AFTER_RUN_TARGET_TEST: 'ici_with_unset_variables source /root/target_ws/install/setup.bash && cd /root/target_ws/build/pinocchio && make test'
IMMEDIATE_TEST_OUTPUT: 1
runs-on: ubuntu-latest
Expand Down
8 changes: 4 additions & 4 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
<build_depend>doxygen</build_depend>
<doc_depend>doxygen</doc_depend>
<doc_depend>texlive-latex-base</doc_depend>
<!-- Required for the environment variables (ROS_VERSION, ROS_DISTRO) to be available -->
<depend>ros_environment</depend>
<!-- The following tags are recommended by REP-136 -->
<exec_depend condition="$ROS_VERSION == 1">catkin</exec_depend>
<depend condition="$ROS_PYTHON_VERSION == 2">python</depend>
<depend condition="$ROS_PYTHON_VERSION == 3">python3</depend>
<depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</depend>
<depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</depend>
<depend>python3</depend>
<depend>python3-numpy</depend>
<depend>liburdfdom-dev</depend>
<depend>eigen</depend>
<depend>boost</depend>
Expand Down
Loading