From 1a02e6f828bc431dd307dcbaaed6bbca08e04abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Mon, 23 Mar 2026 19:41:48 +0100 Subject: [PATCH 1/2] Install cpp-expected for windows job (#2225) (cherry picked from commit 80bfe93450b95df379d00a16c75e284c2303c589) # Conflicts: # .github/workflows/rolling-semi-binary-build-win.yml --- .github/workflows/rolling-semi-binary-build-win.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/rolling-semi-binary-build-win.yml b/.github/workflows/rolling-semi-binary-build-win.yml index 0b0801f7f7..44f5da66be 100644 --- a/.github/workflows/rolling-semi-binary-build-win.yml +++ b/.github/workflows/rolling-semi-binary-build-win.yml @@ -27,5 +27,9 @@ jobs: uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master with: ros_distro: rolling +<<<<<<< HEAD pixi_dependencies: typeguard jinja2 boost compilers +======= + pixi_dependencies: typeguard jinja2 boost compilers octomap cpp-expected +>>>>>>> 80bfe93 (Install cpp-expected for windows job (#2225)) ninja_packages: rsl From 2580f61ac69c40ac02b5355338205b234a047014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Mon, 23 Mar 2026 19:48:31 +0100 Subject: [PATCH 2/2] Update rolling-semi-binary-build-win.yml --- .github/workflows/rolling-semi-binary-build-win.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/rolling-semi-binary-build-win.yml b/.github/workflows/rolling-semi-binary-build-win.yml index 44f5da66be..d4aee110e0 100644 --- a/.github/workflows/rolling-semi-binary-build-win.yml +++ b/.github/workflows/rolling-semi-binary-build-win.yml @@ -27,9 +27,5 @@ jobs: uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master with: ros_distro: rolling -<<<<<<< HEAD - pixi_dependencies: typeguard jinja2 boost compilers -======= pixi_dependencies: typeguard jinja2 boost compilers octomap cpp-expected ->>>>>>> 80bfe93 (Install cpp-expected for windows job (#2225)) ninja_packages: rsl