From 742a46ab76e2a331fe2e2cb1b6d50ee37987316d Mon Sep 17 00:00:00 2001 From: Maciej Majek Date: Tue, 3 Jun 2025 12:02:32 +0200 Subject: [PATCH 1/3] ci: fix --- .github/workflows/poetry-test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/poetry-test.yml b/.github/workflows/poetry-test.yml index ae85f5c0d..a8072729c 100644 --- a/.github/workflows/poetry-test.yml +++ b/.github/workflows/poetry-test.yml @@ -30,6 +30,11 @@ jobs: with: clean: true + - name: Remove ros2-snapshots + run: | + rm /etc/apt/sources.list.d/ros2-snapshots.list + rm /usr/share/keyrings/ros2-snapshots-archive-keyring.gpg + - name: Install Poetry uses: snok/install-poetry@v1 with: From ee73132eec41200e328ebd228e1f31f9d125a65a Mon Sep 17 00:00:00 2001 From: Maciej Majek Date: Tue, 3 Jun 2025 12:05:25 +0200 Subject: [PATCH 2/3] ci: fix --- .github/workflows/poetry-test.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/poetry-test.yml b/.github/workflows/poetry-test.yml index a8072729c..b37c54acc 100644 --- a/.github/workflows/poetry-test.yml +++ b/.github/workflows/poetry-test.yml @@ -32,8 +32,26 @@ jobs: - name: Remove ros2-snapshots run: | - rm /etc/apt/sources.list.d/ros2-snapshots.list - rm /usr/share/keyrings/ros2-snapshots-archive-keyring.gpg + rm /etc/apt/sources.list.d/ros2-latest.list + rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg + + - name: Install ca-certificates and curl + run: | + apt-get update + apt-get install -y ca-certificates curl + + - name: Install ros2-apt-source + run: | + apt-get update + apt-get install -y ca-certificates curl + + - name: Install ros2-apt-source + run: | + export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}') ;\ + curl -L -s -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 $VERSION_CODENAME)_all.deb" \ + && apt-get update \ + && apt-get install /tmp/ros2-apt-source.deb \ + && rm -f /tmp/ros2-apt-source.deb - name: Install Poetry uses: snok/install-poetry@v1 From 0eb8c5a73a894ee6966dfb79c574b1ebaf17164d Mon Sep 17 00:00:00 2001 From: Maciej Majek Date: Tue, 3 Jun 2025 12:09:38 +0200 Subject: [PATCH 3/3] ci: fix --- .github/workflows/poetry-test.yml | 13 +------------ .github/workflows/pre-commit.yml | 12 ++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/poetry-test.yml b/.github/workflows/poetry-test.yml index b37c54acc..0b1fc7121 100644 --- a/.github/workflows/poetry-test.yml +++ b/.github/workflows/poetry-test.yml @@ -30,23 +30,12 @@ jobs: with: clean: true - - name: Remove ros2-snapshots + - name: Fix ROS 2 keys # TODO: remove this once https://github.com/docker-library/official-images/pull/19162 is merged run: | rm /etc/apt/sources.list.d/ros2-latest.list rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg - - - name: Install ca-certificates and curl - run: | - apt-get update - apt-get install -y ca-certificates curl - - - name: Install ros2-apt-source - run: | apt-get update apt-get install -y ca-certificates curl - - - name: Install ros2-apt-source - run: | export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}') ;\ curl -L -s -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 $VERSION_CODENAME)_all.deb" \ && apt-get update \ diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 15d3b622a..35c8f77b3 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -16,6 +16,18 @@ jobs: image: osrf/ros:humble-desktop-full steps: + - name: Fix ROS 2 keys # TODO: remove this once https://github.com/docker-library/official-images/pull/19162 is merged + run: | + rm /etc/apt/sources.list.d/ros2-latest.list + rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg + apt-get update + apt-get install -y ca-certificates curl + export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}') ;\ + curl -L -s -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 $VERSION_CODENAME)_all.deb" \ + && apt-get update \ + && apt-get install /tmp/ros2-apt-source.deb \ + && rm -f /tmp/ros2-apt-source.deb + - name: Install pre-commit run: | apt update && apt install -y python3-pip shellcheck python-is-python3