From 8521afb64ffaf9b8908871902627e44633409966 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Mon, 30 Jun 2025 09:27:56 +0200 Subject: [PATCH 1/5] upgrade colcon-cargo in pixi.toml --- .github/workflows/rust-win.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rust-win.yml b/.github/workflows/rust-win.yml index a5619671..e1ee7c6d 100644 --- a/.github/workflows/rust-win.yml +++ b/.github/workflows/rust-win.yml @@ -52,6 +52,7 @@ jobs: if (Test-Path $src) { Rename-Item -Path $src -NewName "libclang.dll" } pixi add --pypi "colcon-ros-cargo@git+https://github.com/colcon/colcon-ros-cargo.git" --manifest-path C:\pixi_ws\pixi.toml pixi add --pypi "colcon-cargo@git+https://github.com/colcon/colcon-cargo.git" --manifest-path C:\pixi_ws\pixi.toml + pixi upgrade --pypi colcon-core --manifest-path C:\pixi_ws\pixi.toml - name: Build the rust package env: From b17d1c404a89197077bfb290ca6e85e7cbbddb82 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Mon, 30 Jun 2025 09:46:23 +0200 Subject: [PATCH 2/5] move zip file unzipd own and remove --pypi for upgrade --- .github/workflows/rust-win.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust-win.yml b/.github/workflows/rust-win.yml index e1ee7c6d..85ab6ccf 100644 --- a/.github/workflows/rust-win.yml +++ b/.github/workflows/rust-win.yml @@ -36,11 +36,6 @@ jobs: with: manifest-path: C:/pixi_ws/pixi.toml - - name: Get prebuild ROS files and unzip - run: | - irm https://ci.ros2.org/view/packaging/job/packaging_windows/lastSuccessfulBuild/artifact/ws/ros2-package-windows-AMD64.zip -Outfile ros2-package-windows-AMD64.zip - Expand-Archive -Path ros2-package-windows-AMD64.zip -DestinationPath C:/pixi_ws/ - - name: Install ros2_rust prerequisites # prerequisites and fixes for windows build ros2_rust: # * Libclang has to be added (from the ros2_rust instructions) and the dll has to be renamed @@ -52,7 +47,12 @@ jobs: if (Test-Path $src) { Rename-Item -Path $src -NewName "libclang.dll" } pixi add --pypi "colcon-ros-cargo@git+https://github.com/colcon/colcon-ros-cargo.git" --manifest-path C:\pixi_ws\pixi.toml pixi add --pypi "colcon-cargo@git+https://github.com/colcon/colcon-cargo.git" --manifest-path C:\pixi_ws\pixi.toml - pixi upgrade --pypi colcon-core --manifest-path C:\pixi_ws\pixi.toml + pixi upgrade colcon-core --manifest-path C:\pixi_ws\pixi.toml + + - name: Get prebuild ROS files and unzip + run: | + irm https://ci.ros2.org/view/packaging/job/packaging_windows/lastSuccessfulBuild/artifact/ws/ros2-package-windows-AMD64.zip -Outfile ros2-package-windows-AMD64.zip + Expand-Archive -Path ros2-package-windows-AMD64.zip -DestinationPath C:/pixi_ws/ - name: Build the rust package env: From 760a5123337cc2a2d3af24509d7f66e1788feaa9 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Tue, 1 Jul 2025 11:31:31 +0200 Subject: [PATCH 3/5] update name package logging demo --- examples/logging_demo/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/logging_demo/Cargo.toml b/examples/logging_demo/Cargo.toml index 778981c5..a959249a 100644 --- a/examples/logging_demo/Cargo.toml +++ b/examples/logging_demo/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "logging_demo" +name = "examples_logging_demo" version = "0.1.0" edition = "2021" From 443f06c20ab4fe6d46cbfefadc78ac9df1e14929 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Tue, 1 Jul 2025 11:31:58 +0200 Subject: [PATCH 4/5] update package name worker demo --- examples/worker_demo/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/worker_demo/Cargo.toml b/examples/worker_demo/Cargo.toml index 7fd78c74..2cde2426 100644 --- a/examples/worker_demo/Cargo.toml +++ b/examples/worker_demo/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "worker_demo" +name = "examples_worker_demo" version = "0.1.0" edition = "2021" From de7fe394d60eebfbaee7d1c8d1bbb78dee71010e Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Tue, 1 Jul 2025 12:56:04 +0200 Subject: [PATCH 5/5] update parameter_demo naming --- examples/parameter_demo/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/parameter_demo/Cargo.toml b/examples/parameter_demo/Cargo.toml index 4f90061a..6a20a9a3 100644 --- a/examples/parameter_demo/Cargo.toml +++ b/examples/parameter_demo/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "parameter_demo" +name = "examples_parameter_demo" version = "0.1.0" edition = "2021"