Merge branch 'ros2-rust:main' into maspe36/flexible_dockerfile_for_distros

Author: maspe36

.github/workflows/rust-minimal.yml

@@ -99,7 +99,7 @@ jobs:
         for path in $(colcon list | awk '$3 == "(ament_cargo)" { print $2 }'); do
         cd $path
         echo "Running clippy in $path"
-        # Run clippy for all features except generate_docs (needed for docs.rs)
+        # Run clippy for all features except use_ros_shim (needed for docs.rs)
         if [ "$(basename $path)" = "rclrs" ]; then
           cargo clippy --no-deps --all-targets -F default,dyn_msg -- -D warnings
         else
@@ -115,7 +115,7 @@ jobs:
         for path in $(colcon list | awk '$3 == "(ament_cargo)" && $1 != "examples_rclrs_minimal_pub_sub" && $1 != "examples_rclrs_minimal_client_service" && $1 != "rust_pubsub" { print $2 }'); do
         cd $path
         echo "Running cargo test in $path"
-        # Run cargo test for all features except generate_docs (needed for docs.rs)
+        # Run cargo test for all features except use_ros_shim (needed for docs.rs)
         if [ "$(basename $path)" = "rclrs" ]; then
           cargo test -F default,dyn_msg
         elif [ "$(basename $path)" = "rosidl_runtime_rs" ]; then

.github/workflows/rust-stable.yml

@@ -99,7 +99,7 @@ jobs:
         for path in $(colcon list | awk '$3 == "(ament_cargo)" { print $2 }'); do
         cd $path
         echo "Running clippy in $path"
-        # Run clippy for all features except generate_docs (needed for docs.rs)
+        # Run clippy for all features except use_ros_shim (needed for docs.rs)
         if [ "$(basename $path)" = "rclrs" ]; then
           cargo clippy --no-deps --all-targets -F default,dyn_msg -- -D warnings
         else
@@ -115,7 +115,7 @@ jobs:
         for path in $(colcon list | awk '$3 == "(ament_cargo)" && $1 != "examples_rclrs_minimal_pub_sub" && $1 != "examples_rclrs_minimal_client_service" && $1 != "rust_pubsub" { print $2 }'); do
         cd $path
         echo "Running cargo test in $path"
-        # Run cargo test for all features except generate_docs (needed for docs.rs)
+        # Run cargo test for all features except use_ros_shim (needed for docs.rs)
         if [ "$(basename $path)" = "rclrs" ]; then
           cargo test -F default,dyn_msg
         elif [ "$(basename $path)" = "rosidl_runtime_rs" ]; then

.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:

.gitignore

@@ -214,6 +214,7 @@ dmypy.json
 # Generated by Cargo
 # will have compiled files and executables
 /target/
+Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk