From e8a15a09b0d86d33660ddf7de42559cca0d204aa Mon Sep 17 00:00:00 2001 From: Luca Della Vedova Date: Sat, 25 May 2024 08:45:56 +0200 Subject: [PATCH] Back to desktop-full image after rolling sync Signed-off-by: Luca Della Vedova --- .github/workflows/reusable_build.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reusable_build.yaml b/.github/workflows/reusable_build.yaml index a0bf4b8..f56fd11 100644 --- a/.github/workflows/reusable_build.yaml +++ b/.github/workflows/reusable_build.yaml @@ -37,9 +37,7 @@ jobs: runs-on: ubuntu-latest container: # TODO: check if "desktop" is really needed for the builds or tests - # TODO(luca): Restore to this image once rolling-desktop-full is migrated to noble - # image: osrf/ros:${{ matrix.ros_distribution }}-desktop-${{ matrix.ubuntu_distribution }} - image: ros:${{ matrix.ros_distribution }} + image: osrf/ros:${{ matrix.ros_distribution }}-desktop-${{ matrix.ubuntu_distribution }} steps: - name: create_blacklist run: | @@ -49,7 +47,7 @@ jobs: echo "fun:*Eigen*" > ${{ github.workspace }}/blacklist.txt fi - name: Setup ROS - uses: ros-tooling/setup-ros@christophebedard/noble-install-libclang-rt-dev + uses: ros-tooling/setup-ros@d8f32e5 - name: install_tools run: sudo apt update && sudo apt install -y ccache clang clang-tools lld wget python3-pip python3-colcon-coveragepy-result python3-colcon-lcov-result lcov - name: set mixins