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.

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

Sync industrial_ci for ros-ci #2550

Open
wants to merge 3 commits into
base: devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions .github/workflows/ros-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ jobs:
strategy:
matrix:
env:
- {ROS_DISTRO: noetic, BUILDER: catkin_tools}
- {ROS_DISTRO: rolling}
- {ROS_DISTRO: iron}
- {ROS_DISTRO: humble}
- {ROS_DISTRO: noetic, BUILDER: catkin_tools, IMMEDIATE_TEST_OUTPUT: true}
- {ROS_DISTRO: rolling, IMMEDIATE_TEST_OUTPUT: true}
- {ROS_DISTRO: iron, IMMEDIATE_TEST_OUTPUT: true}
- {ROS_DISTRO: humble, IMMEDIATE_TEST_OUTPUT: true}
env:
CCACHE_DIR: /github/home/.ccache # Enable ccache
# The following is a work-around for ROS1 tooling in conjunction with jrl-cmakemodules:
Expand All @@ -53,7 +53,6 @@ jobs:
# 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.
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
steps:
- uses: actions/checkout@v4
Expand All @@ -66,5 +65,5 @@ jobs:
key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}-${{ github.sha }}
restore-keys: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}-
# Run industrial_ci
- uses: ros-industrial/industrial_ci@8d0620b3c43fc3bb2599b6ede6e0a261a2eced02
- uses: ros-industrial/industrial_ci@8c9b2a6657124a2abf96ef0137f354b0b02d1330
env: ${{ matrix.env }}
4 changes: 2 additions & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ configure = { cmd = [
"-DBUILD_WITH_SDF_SUPPORT=$PINOCCHIO_SDF_SUPPORT",
"-DBUILD_PYTHON_BINDINGS_WITH_BOOST_MPFR_SUPPORT=$PINOCCHIO_MPFR_SUPPORT",
] }
build = { cmd = "cmake --build build --target all", depends_on = ["configure"] }
build = { cmd = "cmake --build build --target all", depends-on = ["configure"] }
clean = { cmd = "rm -rf build" }
test = { cmd = "ctest --test-dir build --output-on-failure", depends_on = [
test = { cmd = "ctest --test-dir build --output-on-failure", depends-on = [
"build",
] }

Expand Down
Loading