From f17890a225d9631313d52d86a80e156e6e947cfe Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 30 Mar 2022 09:58:03 +0200 Subject: [PATCH] Fix Agent and host Rolling CI (#486) Signed-off-by: Pablo Garrido (cherry picked from commit d71ce51e458f922437b6e5449015b5d1f59da5d5) # Conflicts: # .github/workflows/ci.yml # .github/workflows/nightly.yml --- .github/workflows/ci.yml | 20 ++++++++++++++++++++ .github/workflows/nightly.yml | 8 ++++++++ 2 files changed, 28 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 289a9e56..8f1423d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,8 +53,14 @@ jobs: # Workaround. Remove when https://discourse.ros.org/t/preparing-for-rolling-sync-delayed-by-python-3-10-transition/24521 solved apt install -y python3.9-dev apt install -y python3-colcon-metadata python3-pip +<<<<<<< HEAD rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y +======= + apt install -y ros-${ROS_DISTRO}-rmw-fastrtps-cpp + rosdep update --os=ubuntu:jammy --rosdistro $ROS_DISTRO + rosdep install --os=ubuntu:jammy -y --from-paths src --ignore-src -y +>>>>>>> d71ce51 (Fix Agent and host Rolling CI (#486)) - uses: actions/download-artifact@v1 with: @@ -194,9 +200,23 @@ jobs: - name: Dependencies run: | apt update +<<<<<<< HEAD apt install -y python3-colcon-metadata python3-pip rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y +======= + apt upgrade -y + # Workaround. Remove when https://discourse.ros.org/t/preparing-for-rolling-sync-delayed-by-python-3-10-transition/24521 solved + apt install -y python3.9-dev + # Install last version of CMake + apt install -y apt-transport-https ca-certificates gnupg software-properties-common wget + wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null + apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' + apt-get update + apt install -y python3-colcon-metadata python3-pip cmake + rosdep update --os=ubuntu:jammy --rosdistro $ROS_DISTRO + rosdep install --os=ubuntu:jammy -y --from-paths src --ignore-src -y +>>>>>>> d71ce51 (Fix Agent and host Rolling CI (#486)) - uses: actions/download-artifact@v1 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ffde638f..1e06c9c9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -379,9 +379,17 @@ jobs: - name: dependencies run: | apt update + # Workaround. Remove when https://discourse.ros.org/t/preparing-for-rolling-sync-delayed-by-python-3-10-transition/24521 solved + apt install -y python3.9-dev apt install -y python3-colcon-metadata python3-pip +<<<<<<< HEAD rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y +======= + apt install -y ros-${ROS_DISTRO}-rmw-fastrtps-cpp + rosdep update --os=ubuntu:jammy --rosdistro $ROS_DISTRO + rosdep install --os=ubuntu:jammy -y --from-paths src --ignore-src -y +>>>>>>> d71ce51 (Fix Agent and host Rolling CI (#486)) - uses: actions/download-artifact@v1 with: