Skip to content

Commit 0450447

Browse files
committed
Address comments
1 parent 7df9990 commit 0450447

5 files changed

Lines changed: 13 additions & 6 deletions

File tree

.github/workflows/linux-arm64-build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
# Kilted Kaiju (May 2025 - Dec 2026)
3838
- docker_image: ubuntu:noble
3939
ros_distribution: kilted
40-
# Lyrical Luth (May 2026 - May 2031, beta)
40+
# Lyrical Luth (May 2026 - May 2031)
4141
- docker_image: ubuntu:26.04
4242
ros_distribution: lyrical
4343

.github/workflows/linux-x64-build-and-test.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
# Kilted Kaiju (May 2025 - Dec 2026)
3939
- docker_image: ubuntu:noble
4040
ros_distribution: kilted
41-
# Lyrical Luth (May 2026 - May 2031, beta)
41+
# Lyrical Luth (May 2026 - May 2031)
4242
- docker_image: ubuntu:26.04
4343
ros_distribution: lyrical
4444
# Rolling Ridley (No End-Of-Life) - migrated to Ubuntu 26.04 (resolute)
@@ -76,7 +76,10 @@ jobs:
7676
curl -L -o /tmp/ros2-apt-source.deb "https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.$(. /etc/os-release && echo ${UBUNTU_CODENAME:-${VERSION_CODENAME}})_all.deb"
7777
dpkg -i /tmp/ros2-apt-source.deb
7878
apt-get update
79-
apt-get install -y build-essential cmake tar bzip2 python3 python3-rosdep python3-colcon-common-extensions
79+
# Common build deps for both rolling and lyrical. Rolling-only tarball
80+
# tooling (tar, bzip2, python3-rosdep) is installed in the rolling step
81+
# below so the lyrical lane stays minimal.
82+
apt-get install -y build-essential cmake python3 python3-colcon-common-extensions
8083
8184
- name: Install ROS2 from apt (lyrical)
8285
if: ${{ matrix.ros_distribution == 'lyrical' }}
@@ -89,6 +92,10 @@ jobs:
8992
- name: Install ROS2 from binary tarball (rolling)
9093
if: ${{ matrix.ros_distribution == 'rolling' }}
9194
run: |
95+
# Tools only the rolling tarball path needs: tar/bzip2 for extraction,
96+
# python3-rosdep for resolving runtime deps below.
97+
apt-get install -y tar bzip2 python3-rosdep
98+
9299
# Extract binary tarball AFTER apt packages so its newer libs overwrite apt's older ones
93100
curl -sL "${{ matrix.ros_tar_url }}" -o /tmp/ros2-${{ matrix.ros_distribution }}.tar.bz2
94101
mkdir -p /opt/ros/${{ matrix.ros_distribution }}

.github/workflows/prebuild-linux-arm64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- docker_image: ubuntu:noble
3333
ros_distribution: kilted
3434
ubuntu_codename: noble
35-
# Lyrical Luth (May 2026 - May 2031, beta)
35+
# Lyrical Luth (May 2026 - May 2031)
3636
- docker_image: ubuntu:26.04
3737
ros_distribution: lyrical
3838
ubuntu_codename: resolute

.github/workflows/prebuild-linux-x64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- docker_image: ubuntu:noble
3333
ros_distribution: kilted
3434
ubuntu_codename: noble
35-
# Lyrical Luth (May 2026 - May 2031, beta)
35+
# Lyrical Luth (May 2026 - May 2031)
3636
- docker_image: ubuntu:26.04
3737
ros_distribution: lyrical
3838
ubuntu_codename: resolute

.github/workflows/windows-build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- ros_distribution: kilted
2828
ros_zip_url: "https://github.com/ros2/ros2/releases/download/release-kilted-20250728/ros2-kilted-20250728-windows-release-amd64.zip"
2929
run_tests: false
30-
# Lyrical Luth (May 2026 - May 2031, beta)
30+
# Lyrical Luth (May 2026 - May 2031)
3131
# Reference: https://docs.ros.org/en/lyrical/Installation/Windows-Install-Binary.html
3232
- ros_distribution: lyrical
3333
ros_zip_url: "https://github.com/ros2/ros2/releases/download/release-lyrical-20260522/ros2-lyrical-2026-05-22-windows-AMD64.zip"

0 commit comments

Comments
 (0)