From 6514fa7096182b039ae97485a241912cddc60b73 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 11 Apr 2022 07:52:54 +0200 Subject: [PATCH 1/2] Remove Python 3.9 (#496) Signed-off-by: Pablo Garrido (cherry picked from commit d327cba7142a993020819bb2d86ff684395a470a) # Conflicts: # .github/workflows/ci.yml --- .github/workflows/ci.yml | 18 ++++++++++++++++-- .github/workflows/nightly.yml | 2 -- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c64901f6..65c218e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,8 +50,6 @@ 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 @@ -196,9 +194,25 @@ jobs: run: | apt update apt upgrade -y +<<<<<<< HEAD apt install -y python3-colcon-metadata python3-pip rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y +======= + # Install last version of CMake + apt install -y apt-transport-https ca-certificates gnupg software-properties-common wget + if [ $(lsb_release -sr) = "22.04" ]; then + echo "Using Ubuntu mainline CMake" + else + echo "Adding Kitware CMake repo to install CMake" + 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' + fi + 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 +>>>>>>> d327cba (Remove Python 3.9 (#496)) - uses: actions/download-artifact@v1 with: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d0b7ae97..d7a59f59 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -380,8 +380,6 @@ 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 From 74055c59f41a44b06ef45ed724fab16ef448bc81 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 11 Apr 2022 07:57:04 +0200 Subject: [PATCH 2/2] Update Signed-off-by: Pablo Garrido --- .github/workflows/ci.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65c218e1..9922ef05 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -194,25 +194,9 @@ jobs: run: | apt update apt upgrade -y -<<<<<<< HEAD apt install -y python3-colcon-metadata python3-pip rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y -======= - # Install last version of CMake - apt install -y apt-transport-https ca-certificates gnupg software-properties-common wget - if [ $(lsb_release -sr) = "22.04" ]; then - echo "Using Ubuntu mainline CMake" - else - echo "Adding Kitware CMake repo to install CMake" - 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' - fi - 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 ->>>>>>> d327cba (Remove Python 3.9 (#496)) - uses: actions/download-artifact@v1 with: