Skip to content

Commit dba36cc

Browse files
authored
upgrade colcon-cargo in pixi.toml for windows CI (#495)
* upgrade colcon-cargo in pixi.toml * move zip file unzipd own and remove --pypi for upgrade * update name package logging demo * update package name worker demo * update parameter_demo naming
1 parent eca3f9a commit dba36cc

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.github/workflows/rust-win.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ jobs:
3636
with:
3737
manifest-path: C:/pixi_ws/pixi.toml
3838

39-
- name: Get prebuild ROS files and unzip
40-
run: |
41-
irm https://ci.ros2.org/view/packaging/job/packaging_windows/lastSuccessfulBuild/artifact/ws/ros2-package-windows-AMD64.zip -Outfile ros2-package-windows-AMD64.zip
42-
Expand-Archive -Path ros2-package-windows-AMD64.zip -DestinationPath C:/pixi_ws/
43-
4439
- name: Install ros2_rust prerequisites
4540
# prerequisites and fixes for windows build ros2_rust:
4641
# * Libclang has to be added (from the ros2_rust instructions) and the dll has to be renamed
@@ -52,6 +47,12 @@ jobs:
5247
if (Test-Path $src) { Rename-Item -Path $src -NewName "libclang.dll" }
5348
pixi add --pypi "colcon-ros-cargo@git+https://github.com/colcon/colcon-ros-cargo.git" --manifest-path C:\pixi_ws\pixi.toml
5449
pixi add --pypi "colcon-cargo@git+https://github.com/colcon/colcon-cargo.git" --manifest-path C:\pixi_ws\pixi.toml
50+
pixi upgrade colcon-core --manifest-path C:\pixi_ws\pixi.toml
51+
52+
- name: Get prebuild ROS files and unzip
53+
run: |
54+
irm https://ci.ros2.org/view/packaging/job/packaging_windows/lastSuccessfulBuild/artifact/ws/ros2-package-windows-AMD64.zip -Outfile ros2-package-windows-AMD64.zip
55+
Expand-Archive -Path ros2-package-windows-AMD64.zip -DestinationPath C:/pixi_ws/
5556
5657
- name: Build the rust package
5758
env:

examples/logging_demo/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "logging_demo"
2+
name = "examples_logging_demo"
33
version = "0.1.0"
44
edition = "2021"
55

examples/parameter_demo/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "parameter_demo"
2+
name = "examples_parameter_demo"
33
version = "0.1.0"
44
edition = "2021"
55

examples/worker_demo/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "worker_demo"
2+
name = "examples_worker_demo"
33
version = "0.1.0"
44
edition = "2021"
55

0 commit comments

Comments
 (0)