From 14c206182855811285b564ac82b7db97dd589371 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 30 Mar 2022 08:51:30 +0200 Subject: [PATCH 1/2] Enable rolling agent (#479) * Enable rolling agent Signed-off-by: Pablo Garrido * Install python3.9-dev Signed-off-by: Pablo Garrido * Fix Signed-off-by: Pablo Garrido (cherry picked from commit 91ed37171369e495fcfd2e686b11781d301bd6fc) # Conflicts: # .github/workflows/ci.yml # .github/workflows/nightly.yml --- .github/workflows/ci.yml | 15 +++++++++++++++ .github/workflows/nightly.yml | 7 +++++++ 2 files changed, 22 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a99b6c14..269a667e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,6 +50,8 @@ 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 rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y @@ -192,9 +194,22 @@ 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 +======= + # 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 +>>>>>>> 91ed371 (Enable rolling agent (#479)) - uses: actions/download-artifact@v1 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a9b1dda2..ea505039 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -362,8 +362,15 @@ jobs: include: - distro: foxy branch: foxy +<<<<<<< HEAD # - distro: rolling # branch: main +======= + - distro: rolling + branch: main + - distro: galactic + branch: galactic +>>>>>>> 91ed371 (Enable rolling agent (#479)) needs: micro_ros_build container: ros:${{ matrix.distro }} From 28bf22ef13f108221a753272f46c3331033f6a90 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 30 Mar 2022 08:53:43 +0200 Subject: [PATCH 2/2] update Signed-off-by: Pablo Garrido --- .github/workflows/ci.yml | 6 ------ .github/workflows/nightly.yml | 5 ----- 2 files changed, 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 269a667e..1b832ce1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -194,11 +194,6 @@ 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 -======= # 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 @@ -209,7 +204,6 @@ jobs: 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 ->>>>>>> 91ed371 (Enable rolling agent (#479)) - uses: actions/download-artifact@v1 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ea505039..620e9680 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -362,15 +362,10 @@ jobs: include: - distro: foxy branch: foxy -<<<<<<< HEAD - # - distro: rolling - # branch: main -======= - distro: rolling branch: main - distro: galactic branch: galactic ->>>>>>> 91ed371 (Enable rolling agent (#479)) needs: micro_ros_build container: ros:${{ matrix.distro }}