From 9b8df6a142d791df93d46b18107e74dbedbfd964 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 30 Mar 2022 09:58:03 +0200 Subject: [PATCH 1/2] 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 | 7 +++++++ .github/workflows/nightly.yml | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 081ed30c..3189a651 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,8 +55,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: @@ -193,6 +199,7 @@ jobs: - name: Dependencies run: | apt update + 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 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index bd98a67a..151c0b1c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -524,9 +524,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: From 89b0145bcbf7a2d4c9810b9e983e3148d1a82f8b Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 30 Mar 2022 10:02:31 +0200 Subject: [PATCH 2/2] Fix Signed-off-by: Pablo Garrido --- .github/workflows/ci.yml | 5 ----- .github/workflows/nightly.yml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3189a651..50ccd114 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,14 +55,9 @@ 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: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 151c0b1c..01a15963 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -527,14 +527,9 @@ 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: