From 0b78c12f2a305ad4f7f0ad2285d4e51847cb05bc Mon Sep 17 00:00:00 2001 From: nnmm Date: Sat, 9 Jul 2022 18:36:17 +0200 Subject: [PATCH] Add windows CI --- .github/workflows/{rust.yml => ubuntu.yml} | 2 +- .github/workflows/windows.yml | 111 ++++++++++++++++++ .../rosidl_generator_rs/__init__.py | 3 + 3 files changed, 115 insertions(+), 1 deletion(-) rename .github/workflows/{rust.yml => ubuntu.yml} (99%) create mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/rust.yml b/.github/workflows/ubuntu.yml similarity index 99% rename from .github/workflows/rust.yml rename to .github/workflows/ubuntu.yml index dc6106ce..167f3134 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/ubuntu.yml @@ -1,4 +1,4 @@ -name: Rust +name: Ubuntu on: push: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 00000000..94964fd5 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,111 @@ +name: Windows + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +env: + CARGO_TERM_COLOR: always + +jobs: + build-windows: + strategy: + matrix: + ros_distribution: + - foxy + runs-on: windows-2019 + steps: + - uses: actions/checkout@v2 + + - name: Setup ROS environment + uses: ros-tooling/setup-ros@v0.3 + with: + required-ros-distributions: ${{ matrix.ros_distribution }} + + - name: Search packages in this repository + id: list_packages + run: | + echo ::set-output name=package_list::$(colcon list --names-only) + shell: bash + + - name: Setup Rust + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + components: clippy, rustfmt + + - name: Install colcon-cargo and colcon-ros-cargo + run: | + C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts\pip3.exe install git+https://github.com/colcon/colcon-cargo.git + C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts\pip3.exe install git+https://github.com/colcon/colcon-ros-cargo.git@fix_windows + rosdep update + + - name: Check formatting of Rust packages + run: | + for path in $(colcon list | awk '$3 == "(ament_cargo)" { print $2 }'); do + cd $path + cargo fmt -- --check + cd - + done + shell: bash + + - name: Install cargo-ament-build + run: | + cargo install --debug cargo-ament-build + + - name: Add clang path to $PATH env + shell: bash + if: runner.os == 'Windows' + run: echo "PATH=$PATH:C:\msys64\mingw64\bin" >> $GITHUB_ENV + + - name: Echo package list + shell: bash + run: echo ${{ steps.list_packages.outputs.package_list }} + + - name: Build and test + id: build + uses: ros-tooling/action-ros-ci@master + with: + package-name: ${{ steps.list_packages.outputs.package_list }} + target-ros2-distro: ${{ matrix.ros_distribution }} + vcs-repo-file-url: ros2_rust_${{ matrix.ros_distribution }}.repos + + - name: Run clippy on Rust packages + run: | + cd ${{ steps.build.outputs.ros-workspace-directory-name }} + . /opt/ros/${{ matrix.ros_distribution }}/setup.sh + for path in $(colcon list | awk '$3 == "(ament_cargo)" { print $2 }'); do + cd $path + echo "Running clippy in $path" + cargo clippy --all-targets --all-features -- -D warnings + cd - + done + shell: bash + + - name: Run cargo test on Rust packages + run: | + cd ${{ steps.build.outputs.ros-workspace-directory-name }} + . /opt/ros/${{ matrix.ros_distribution }}/setup.sh + for path in $(colcon list | awk '$3 == "(ament_cargo)" && $1 != "examples_rclrs_minimal_pub_sub" && $1 != "examples_rclrs_minimal_client_service" { print $2 }'); do + cd $path + echo "Running cargo test in $path" + cargo test + cd - + done + shell: bash + + - name: Rustdoc check + run: | + cd ${{ steps.build.outputs.ros-workspace-directory-name }} + . /opt/ros/${{ matrix.ros_distribution }}/setup.sh + for path in $(colcon list | awk '$3 == "(ament_cargo)" && $1 != "examples_rclrs_minimal_pub_sub" && $1 != "examples_rclrs_minimal_client_service" { print $2 }'); do + cd $path + echo "Running rustdoc check in $path" + cargo rustdoc -- -D warnings + cd - + done + shell: bash diff --git a/rosidl_generator_rs/rosidl_generator_rs/__init__.py b/rosidl_generator_rs/rosidl_generator_rs/__init__.py index 479d912c..aea7bb14 100644 --- a/rosidl_generator_rs/rosidl_generator_rs/__init__.py +++ b/rosidl_generator_rs/rosidl_generator_rs/__init__.py @@ -81,6 +81,9 @@ def generate_rs(generator_arguments_file, typesupport_impls): idl_file = parse_idl_file(locator) idl_content.elements += idl_file.content.elements + import sys; print("XYZ ros_interface_dependencies =", args.get('ros_interface_dependencies', []), file=sys.stderr) + import sys; print("XYZ dependency_packages =", dependency_packages, file=sys.stderr) + typesupport_impls = typesupport_impls.split(';') template_dir = args['template_dir']