From 67bf1f77bc873931000d51c81d86879390f63664 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Mon, 16 Jun 2025 16:25:04 +0200 Subject: [PATCH 01/13] update CI with jazzy and noble --- .github/workflows/rust-stable.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust-stable.yml b/.github/workflows/rust-stable.yml index fec89e84b..d42c67c6d 100644 --- a/.github/workflows/rust-stable.yml +++ b/.github/workflows/rust-stable.yml @@ -20,14 +20,19 @@ jobs: matrix: ros_distribution: - humble + - jazzy - 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 # 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 From 7904084d1da2a93724078914edf9f4be8922592d Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Mon, 16 Jun 2025 16:41:44 +0200 Subject: [PATCH 02/13] Removing external managed flag for Ubuntu noble --- .github/workflows/rust-stable.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/rust-stable.yml b/.github/workflows/rust-stable.yml index d42c67c6d..69fd5d147 100644 --- a/.github/workflows/rust-stable.yml +++ b/.github/workflows/rust-stable.yml @@ -62,8 +62,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 From 5d3a9329a7002003aa1890a7c45d3c7251e5da6e Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Mon, 16 Jun 2025 16:58:46 +0200 Subject: [PATCH 03/13] Add kilted to stable build CI --- .github/workflows/rust-stable.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/rust-stable.yml b/.github/workflows/rust-stable.yml index 69fd5d147..2027b0984 100644 --- a/.github/workflows/rust-stable.yml +++ b/.github/workflows/rust-stable.yml @@ -31,6 +31,10 @@ jobs: - 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-noble-ros-rolling-ros-base-latest ros_distribution: rolling From 33c58aca60181738870cde5015c22c85049e3f96 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Mon, 16 Jun 2025 16:59:32 +0200 Subject: [PATCH 04/13] Add kilted distribution to matrix stable build ci --- .github/workflows/rust-stable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rust-stable.yml b/.github/workflows/rust-stable.yml index 2027b0984..d53cadc07 100644 --- a/.github/workflows/rust-stable.yml +++ b/.github/workflows/rust-stable.yml @@ -21,6 +21,7 @@ jobs: ros_distribution: - humble - jazzy + - kilted - rolling include: # Humble Hawksbill (May 2022 - May 2027) From 34a2da80bee1f0bfa04344904113a82b4ebd7ed3 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Mon, 16 Jun 2025 17:01:05 +0200 Subject: [PATCH 05/13] add kilted an jazzy to minimal CI ubuntu too --- .github/workflows/rust-minimal.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/rust-minimal.yml b/.github/workflows/rust-minimal.yml index a93dfe318..0168aaad8 100644 --- a/.github/workflows/rust-minimal.yml +++ b/.github/workflows/rust-minimal.yml @@ -20,12 +20,22 @@ 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 ros_distribution: rolling @@ -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 From a7cd31d4a685bf98bf47c890164f41a9ce499795 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Mon, 16 Jun 2025 17:17:14 +0200 Subject: [PATCH 06/13] remove kilted from minimal because it's not available yet --- .github/workflows/rust-minimal.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust-minimal.yml b/.github/workflows/rust-minimal.yml index 0168aaad8..b00c69429 100644 --- a/.github/workflows/rust-minimal.yml +++ b/.github/workflows/rust-minimal.yml @@ -21,7 +21,7 @@ jobs: ros_distribution: - humble - jazzy - - kilted + #- kilted # Is currently not built by ROS tooling - rolling include: # Humble Hawksbill (May 2022 - May 2027) @@ -33,9 +33,10 @@ jobs: 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 + # Is currently not built by ROS tooling + #- 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 ros_distribution: rolling From 291eb869d5fee4345cf87d2872357c201bd06697 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Mon, 16 Jun 2025 17:17:58 +0200 Subject: [PATCH 07/13] Remove kilted from stable build --- .github/workflows/rust-stable.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust-stable.yml b/.github/workflows/rust-stable.yml index d53cadc07..7f1d70571 100644 --- a/.github/workflows/rust-stable.yml +++ b/.github/workflows/rust-stable.yml @@ -21,7 +21,7 @@ jobs: ros_distribution: - humble - jazzy - - kilted + # - kilted # Is currently not built by ROS tooling - rolling include: # Humble Hawksbill (May 2022 - May 2027) @@ -33,9 +33,9 @@ jobs: 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 + #- 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-noble-ros-rolling-ros-base-latest ros_distribution: rolling From 16e68be5c82382a772cae7654c5a4c8fe7cf79f9 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Tue, 17 Jun 2025 08:27:23 +0200 Subject: [PATCH 08/13] Reenable kilted on minimal built --- .github/workflows/rust-minimal.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rust-minimal.yml b/.github/workflows/rust-minimal.yml index b00c69429..0168aaad8 100644 --- a/.github/workflows/rust-minimal.yml +++ b/.github/workflows/rust-minimal.yml @@ -21,7 +21,7 @@ jobs: ros_distribution: - humble - jazzy - #- kilted # Is currently not built by ROS tooling + - kilted - rolling include: # Humble Hawksbill (May 2022 - May 2027) @@ -33,10 +33,9 @@ jobs: ros_distribution: jazzy ros_version: 2 # Kilted Kaiju (May 2025 - Dec 2026) - # Is currently not built by ROS tooling - #- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-kilted-ros-base-latest - # ros_distribution: kilted - # ros_version: 2 + - 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 ros_distribution: rolling From 5500ad2e9fd83d7ddb8e8db6041404ec9b3caec5 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Tue, 17 Jun 2025 08:28:16 +0200 Subject: [PATCH 09/13] Reenable kilted on stable build --- .github/workflows/rust-stable.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust-stable.yml b/.github/workflows/rust-stable.yml index 7f1d70571..d53cadc07 100644 --- a/.github/workflows/rust-stable.yml +++ b/.github/workflows/rust-stable.yml @@ -21,7 +21,7 @@ jobs: ros_distribution: - humble - jazzy - # - kilted # Is currently not built by ROS tooling + - kilted - rolling include: # Humble Hawksbill (May 2022 - May 2027) @@ -33,9 +33,9 @@ jobs: 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 + - 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-noble-ros-rolling-ros-base-latest ros_distribution: rolling From d0b2c3f288b45bec969be9cb61141e2018ba76d3 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Tue, 17 Jun 2025 08:30:14 +0200 Subject: [PATCH 10/13] minimal build rolling also on Ubuntu noble --- .github/workflows/rust-minimal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust-minimal.yml b/.github/workflows/rust-minimal.yml index 0168aaad8..2fcbcb8ac 100644 --- a/.github/workflows/rust-minimal.yml +++ b/.github/workflows/rust-minimal.yml @@ -37,7 +37,7 @@ jobs: 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 From b189b6b363a806c46897fb42b01b8ee6a69400ec Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Tue, 17 Jun 2025 09:41:49 +0200 Subject: [PATCH 11/13] update action-ros-ci to 0.4 minimal build --- .github/workflows/rust-minimal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust-minimal.yml b/.github/workflows/rust-minimal.yml index 2fcbcb8ac..d8f7a29fb 100644 --- a/.github/workflows/rust-minimal.yml +++ b/.github/workflows/rust-minimal.yml @@ -86,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 }} From e768e0ac3db4744eb92dc24e3ba61eba5a34fc74 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Tue, 17 Jun 2025 09:42:32 +0200 Subject: [PATCH 12/13] update action-ros-ci to 0.4 stable build --- .github/workflows/rust-stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust-stable.yml b/.github/workflows/rust-stable.yml index d53cadc07..648b794a7 100644 --- a/.github/workflows/rust-stable.yml +++ b/.github/workflows/rust-stable.yml @@ -86,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 }} From 24a4f68b48375da03c9bc7a2cf26046b0befad33 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Tue, 17 Jun 2025 11:03:17 +0200 Subject: [PATCH 13/13] Create ros2_rust_kilted.repos --- ros2_rust_kilted.repos | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 ros2_rust_kilted.repos diff --git a/ros2_rust_kilted.repos b/ros2_rust_kilted.repos new file mode 100644 index 000000000..1913e677a --- /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