Skip to content

Commit 2f99054

Browse files
Merge branch 'main' into dynamic_messages
Signed-off-by: Luca Della Vedova <[email protected]>
2 parents 42cd70f + eca3f9a commit 2f99054

File tree

5 files changed

+71
-7
lines changed

5 files changed

+71
-7
lines changed

.github/workflows/rust-minimal.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,24 @@ jobs:
2020
matrix:
2121
ros_distribution:
2222
- humble
23+
- jazzy
24+
- kilted
2325
- rolling
2426
include:
2527
# Humble Hawksbill (May 2022 - May 2027)
2628
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
2729
ros_distribution: humble
2830
ros_version: 2
31+
# Jazzy Jalisco (May 2024 - May 2029)
32+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest
33+
ros_distribution: jazzy
34+
ros_version: 2
35+
# Kilted Kaiju (May 2025 - Dec 2026)
36+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-kilted-ros-base-latest
37+
ros_distribution: kilted
38+
ros_version: 2
2939
# Rolling Ridley (June 2020 - Present)
30-
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
40+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest
3141
ros_distribution: rolling
3242
ros_version: 2
3343
runs-on: ubuntu-latest
@@ -57,8 +67,11 @@ jobs:
5767
with:
5868
components: clippy, rustfmt
5969

70+
# Colcon can not be run in a venv which is required in Ubuntu Noble
71+
# Removing the externally managed file
6072
- name: Install colcon-cargo and colcon-ros-cargo
6173
run: |
74+
sudo rm -f /usr/lib/python3.12/EXTERNALLY-MANAGED
6275
sudo pip3 install git+https://github.com/colcon/colcon-cargo.git
6376
sudo pip3 install git+https://github.com/colcon/colcon-ros-cargo.git
6477
@@ -73,7 +86,7 @@ jobs:
7386
7487
- name: Build and test
7588
id: build
76-
uses: ros-tooling/action-ros-ci@v0.3
89+
uses: ros-tooling/action-ros-ci@v0.4
7790
with:
7891
package-name: ${{ steps.list_packages.outputs.package_list }}
7992
target-ros2-distro: ${{ matrix.ros_distribution }}

.github/workflows/rust-stable.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,24 @@ jobs:
2020
matrix:
2121
ros_distribution:
2222
- humble
23+
- jazzy
24+
- kilted
2325
- rolling
2426
include:
2527
# Humble Hawksbill (May 2022 - May 2027)
2628
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
2729
ros_distribution: humble
2830
ros_version: 2
31+
# Jazzy Jalisco (May 2024 - May 2029)
32+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest
33+
ros_distribution: jazzy
34+
ros_version: 2
35+
# Kilted Kaiju (May 2025 - Dec 2026)
36+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-kilted-ros-base-latest
37+
ros_distribution: kilted
38+
ros_version: 2
2939
# Rolling Ridley (June 2020 - Present)
30-
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
40+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest
3141
ros_distribution: rolling
3242
ros_version: 2
3343
runs-on: ubuntu-latest
@@ -57,8 +67,11 @@ jobs:
5767
with:
5868
components: clippy, rustfmt
5969

70+
# Colcon can not be run in a venv which is required in Ubuntu Noble
71+
# Removing the externally managed file
6072
- name: Install colcon-cargo and colcon-ros-cargo
6173
run: |
74+
sudo rm -f /usr/lib/python3.12/EXTERNALLY-MANAGED
6275
sudo pip3 install git+https://github.com/colcon/colcon-cargo.git
6376
sudo pip3 install git+https://github.com/colcon/colcon-ros-cargo.git
6477
@@ -73,7 +86,7 @@ jobs:
7386
7487
- name: Build and test
7588
id: build
76-
uses: ros-tooling/action-ros-ci@v0.3
89+
uses: ros-tooling/action-ros-ci@v0.4
7790
with:
7891
package-name: ${{ steps.list_packages.outputs.package_list }}
7992
target-ros2-distro: ${{ matrix.ros_distribution }}

.github/workflows/rust-win.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Rust ROS 2 Windows build
1+
name: Rust Windows
22

33
on:
44
push:
@@ -26,7 +26,7 @@ jobs:
2626
run: |
2727
mkdir C:\workspace\src
2828
mkdir C:\pixi_ws
29-
xcopy /E /I /Y D:\a\ros2_rust\ros2_rust C:\workspace\src\ros2_rust
29+
xcopy /E /I /Y $env:GITHUB_WORKSPACE C:\workspace\src\ros2_rust
3030
3131
- name: Get pixi toml file
3232
run: irm https://github.com/raw/ros2/ros2/refs/heads/rolling/pixi.toml -OutFile C:\pixi_ws\pixi.toml
@@ -85,4 +85,4 @@ jobs:
8585
)
8686
)
8787
shell: cmd
88-
working-directory: C:\workspace
88+
working-directory: C:\workspace

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ ROS 2 for Rust
33

44
[![Minimal Version Status](https://github.com/ros2-rust/ros2_rust/actions/workflows/rust-minimal.yml/badge.svg?branch=main)](https://github.com/ros2-rust/ros2_rust/actions/workflows/rust-minimal.yml)
55
[![Stable CI Status](https://github.com/ros2-rust/ros2_rust/actions/workflows/rust-stable.yml/badge.svg?branch=main)](https://github.com/ros2-rust/ros2_rust/actions/workflows/rust-stable.yml)
6+
[![Win CI Status](https://github.com/ros2-rust/ros2_rust/actions/workflows/rust-win.yml/badge.svg?branch=main)](https://github.com/ros2-rust/ros2_rust/actions/workflows/rust-win.yml)
67
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
78

89
Introduction

ros2_rust_kilted.repos

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
repositories:
2+
ros2/common_interfaces:
3+
type: git
4+
url: https://github.com/ros2/common_interfaces.git
5+
version: kilted
6+
ros2/example_interfaces:
7+
type: git
8+
url: https://github.com/ros2/example_interfaces.git
9+
version: kilted
10+
ros2/rcl_interfaces:
11+
type: git
12+
url: https://github.com/ros2/rcl_interfaces.git
13+
version: kilted
14+
ros2/test_interface_files:
15+
type: git
16+
url: https://github.com/ros2/test_interface_files.git
17+
version: kilted
18+
ros2/rosidl_core:
19+
type: git
20+
url: https://github.com/ros2/rosidl_core.git
21+
version: kilted
22+
ros2/rosidl_defaults:
23+
type: git
24+
url: https://github.com/ros2/rosidl_defaults.git
25+
version: kilted
26+
ros2/unique_identifier_msgs:
27+
type: git
28+
url: https://github.com/ros2/unique_identifier_msgs.git
29+
version: kilted
30+
ros2-rust/rosidl_rust:
31+
type: git
32+
url: https://github.com/ros2-rust/rosidl_rust.git
33+
version: main
34+
ros2-rust/rosidl_runtime_rs:
35+
type: git
36+
url: https://github.com/ros2-rust/rosidl_runtime_rs.git
37+
version: main

0 commit comments

Comments
 (0)