From bf068b7bd2ab0e44301d265a9843afa135a23958 Mon Sep 17 00:00:00 2001 From: Luca Della Vedova Date: Mon, 13 May 2024 22:01:23 +0800 Subject: [PATCH 1/2] Add jazzy CI Signed-off-by: Luca Della Vedova --- .github/workflows/rust.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e6f015e6..5fa03124 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,6 +18,7 @@ jobs: ros_distribution: - humble - iron + - jazzy - rolling include: # Humble Hawksbill (May 2022 - May 2027) @@ -28,8 +29,12 @@ jobs: - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-iron-ros-base-latest ros_distribution: iron 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 5325fc30693316a6d3d21aab8891e80f43d4a22e Mon Sep 17 00:00:00 2001 From: Esteve Fernandez <33620+esteve@users.noreply.github.com> Date: Mon, 20 May 2024 17:04:39 +0200 Subject: [PATCH 2/2] Use pipx instead of sudo pip install --- .github/workflows/rust.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5fa03124..0fa24e57 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -62,8 +62,10 @@ jobs: - name: Install colcon-cargo and colcon-ros-cargo run: | - sudo pip3 install git+https://github.com/colcon/colcon-cargo.git - sudo pip3 install git+https://github.com/colcon/colcon-ros-cargo.git + sudo apt-get install -y pipx + pipx ensurepath + pipx install git+https://github.com/colcon/colcon-cargo.git + pipx install git+https://github.com/colcon/colcon-ros-cargo.git - name: Check formatting of Rust packages run: |