Merge branch 'ros2-rust:main' into main

Author: balthasarschuess

.github/workflows/generate-bindings.yml

@@ -65,6 +65,18 @@ jobs:
     - name: Install bindgen
       run: cargo binstall -y bindgen-cli
 
+    - name: Install GitHub CLI tool
+      run: |
+        (type -p wget >/dev/null || (sudo apt update && sudo apt install wget -y)) \
+          && sudo mkdir -p -m 755 /etc/apt/keyrings \
+          && out=$(mktemp) && wget -nv -O$out https://cli.github.com/packages/githubcli-archive-keyring.gpg \
+          && cat $out | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \
+          && sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
+          && sudo mkdir -p -m 755 /etc/apt/sources.list.d \
+          && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+          && sudo apt update \
+          && sudo apt install gh -y
+
     - name: Generate bindings
       run: |
         . /opt/ros/${{ matrix.ros_distribution }}/setup.sh
@@ -73,6 +85,8 @@ jobs:
 
     - name: Submit PR
       run: |
+        cd $GITHUB_WORKSPACE
+        git config --global --add safe.directory $GITHUB_WORKSPACE
         if git diff --exit-code; then
           exit 0
         fi

rclrs/build.rs

@@ -21,9 +21,9 @@ fn main() {
     let ros_distro = if let Ok(value) = env::var(ROS_DISTRO) {
         value
     } else {
-        use rustflags;
         cfg_if::cfg_if! {
             if #[cfg(feature="use_ros_shim")] {
+                use rustflags;
                 // // Look for --cfg ros_distro=<ros_distro>
                 for flag in rustflags::from_env() {
                     if matches!(flag, rustflags::Flag::Cfg { ref name, value : _ } if name == "ros_distro") {