diff --git a/.github/workflows/rust-minimal.yml b/.github/workflows/rust-minimal.yml index a93dfe31..d8f7a29f 100644 --- a/.github/workflows/rust-minimal.yml +++ b/.github/workflows/rust-minimal.yml @@ -20,14 +20,24 @@ jobs: matrix: ros_distribution: - humble + - jazzy + - kilted - rolling include: # Humble Hawksbill (May 2022 - May 2027) - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest ros_distribution: humble ros_version: 2 + # Jazzy Jalisco (May 2024 - May 2029) + - docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest + ros_distribution: jazzy + ros_version: 2 + # Kilted Kaiju (May 2025 - Dec 2026) + - docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-kilted-ros-base-latest + ros_distribution: kilted + ros_version: 2 # Rolling Ridley (June 2020 - Present) - - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest + - docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest ros_distribution: rolling ros_version: 2 runs-on: ubuntu-latest @@ -57,8 +67,11 @@ jobs: with: components: clippy, rustfmt + # Colcon can not be run in a venv which is required in Ubuntu Noble + # Removing the externally managed file - name: Install colcon-cargo and colcon-ros-cargo run: | + sudo rm -f /usr/lib/python3.12/EXTERNALLY-MANAGED sudo pip3 install git+https://github.com/colcon/colcon-cargo.git sudo pip3 install git+https://github.com/colcon/colcon-ros-cargo.git @@ -73,7 +86,7 @@ jobs: - name: Build and test id: build - uses: ros-tooling/action-ros-ci@v0.3 + uses: ros-tooling/action-ros-ci@v0.4 with: package-name: ${{ steps.list_packages.outputs.package_list }} target-ros2-distro: ${{ matrix.ros_distribution }} diff --git a/.github/workflows/rust-stable.yml b/.github/workflows/rust-stable.yml index fec89e84..648b794a 100644 --- a/.github/workflows/rust-stable.yml +++ b/.github/workflows/rust-stable.yml @@ -20,14 +20,24 @@ jobs: matrix: ros_distribution: - humble + - jazzy + - kilted - rolling include: # Humble Hawksbill (May 2022 - May 2027) - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest ros_distribution: humble ros_version: 2 + # Jazzy Jalisco (May 2024 - May 2029) + - docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest + ros_distribution: jazzy + ros_version: 2 + # Kilted Kaiju (May 2025 - Dec 2026) + - docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-kilted-ros-base-latest + ros_distribution: kilted + ros_version: 2 # Rolling Ridley (June 2020 - Present) - - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest + - docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest ros_distribution: rolling ros_version: 2 runs-on: ubuntu-latest @@ -57,8 +67,11 @@ jobs: with: components: clippy, rustfmt + # Colcon can not be run in a venv which is required in Ubuntu Noble + # Removing the externally managed file - name: Install colcon-cargo and colcon-ros-cargo run: | + sudo rm -f /usr/lib/python3.12/EXTERNALLY-MANAGED sudo pip3 install git+https://github.com/colcon/colcon-cargo.git sudo pip3 install git+https://github.com/colcon/colcon-ros-cargo.git @@ -73,7 +86,7 @@ jobs: - name: Build and test id: build - uses: ros-tooling/action-ros-ci@v0.3 + uses: ros-tooling/action-ros-ci@v0.4 with: package-name: ${{ steps.list_packages.outputs.package_list }} target-ros2-distro: ${{ matrix.ros_distribution }} diff --git a/ros2_rust_kilted.repos b/ros2_rust_kilted.repos new file mode 100644 index 00000000..1913e677 --- /dev/null +++ b/ros2_rust_kilted.repos @@ -0,0 +1,37 @@ +repositories: + ros2/common_interfaces: + type: git + url: https://github.com/ros2/common_interfaces.git + version: kilted + ros2/example_interfaces: + type: git + url: https://github.com/ros2/example_interfaces.git + version: kilted + ros2/rcl_interfaces: + type: git + url: https://github.com/ros2/rcl_interfaces.git + version: kilted + ros2/test_interface_files: + type: git + url: https://github.com/ros2/test_interface_files.git + version: kilted + ros2/rosidl_core: + type: git + url: https://github.com/ros2/rosidl_core.git + version: kilted + ros2/rosidl_defaults: + type: git + url: https://github.com/ros2/rosidl_defaults.git + version: kilted + ros2/unique_identifier_msgs: + type: git + url: https://github.com/ros2/unique_identifier_msgs.git + version: kilted + ros2-rust/rosidl_rust: + type: git + url: https://github.com/ros2-rust/rosidl_rust.git + version: main + ros2-rust/rosidl_runtime_rs: + type: git + url: https://github.com/ros2-rust/rosidl_runtime_rs.git + version: main