From 1300540744e6b90c6850d3eb646b0c5d789cda9f Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 31 Mar 2022 09:43:55 +0200 Subject: [PATCH 1/2] Fix CI upgrade ROS docker (#489) Signed-off-by: Pablo Garrido (cherry picked from commit 4a2e82c7567b6e0f107cb1e99b8b40eb61d86893) # Conflicts: # .github/workflows/nightly.yml --- .github/workflows/nightly.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 01a15963..45fb275f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -469,12 +469,17 @@ jobs: - name: Dependencies run: | apt update +<<<<<<< HEAD # 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 +======= + apt upgrade -y + apt install -y python3-colcon-metadata python3-pip +>>>>>>> 4a2e82c (Fix CI upgrade ROS docker (#489)) rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y From a6fdc79957b57f097f454c4eeb26a517a2dbd406 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 31 Mar 2022 09:46:25 +0200 Subject: [PATCH 2/2] Fix conflicts Signed-off-by: Pablo Garrido --- .github/workflows/nightly.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 45fb275f..c0bd0f1a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -469,17 +469,13 @@ jobs: - name: Dependencies run: | apt update -<<<<<<< HEAD + apt upgrade -y # 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 -======= - apt upgrade -y - apt install -y python3-colcon-metadata python3-pip ->>>>>>> 4a2e82c (Fix CI upgrade ROS docker (#489)) rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y