From 0833b38cc10c21a4d5053b0737533d6feed4328a Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Tue, 7 Jan 2025 15:42:16 +0100 Subject: [PATCH 1/3] ci/ros: sync industrial_ci --- .github/workflows/ros-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ros-ci.yml b/.github/workflows/ros-ci.yml index c022cbd7d..3c5819398 100644 --- a/.github/workflows/ros-ci.yml +++ b/.github/workflows/ros-ci.yml @@ -66,5 +66,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 }} From 3b6be5ed884ef7ba3b38af82a9ddabb39068e26c Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Tue, 7 Jan 2025 16:32:27 +0100 Subject: [PATCH 2/3] ci/ros: fix IMMEDIATE_TEST_OUTPUT: true --- .github/workflows/ros-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ros-ci.yml b/.github/workflows/ros-ci.yml index 3c5819398..1b64b71cf 100644 --- a/.github/workflows/ros-ci.yml +++ b/.github/workflows/ros-ci.yml @@ -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: @@ -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 From 2f21f0f43c934eb1e50ee7e6cdeaa6f80013e3ca Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Mon, 13 Jan 2025 14:07:57 +0100 Subject: [PATCH 3/3] pixi: depends_on -> depends-on --- pixi.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pixi.toml b/pixi.toml index 5a7a60390..94247d8cf 100644 --- a/pixi.toml +++ b/pixi.toml @@ -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", ] }