diff --git a/.github/workflows/rust-win.yml b/.github/workflows/rust-win.yml index a5619671..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,6 +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 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: 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" 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" 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"