From dafec83c47471687fe217a166ff2ea394d4bf1c3 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f7b2822c..c2265ed1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -334,6 +334,7 @@ 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 @@ -342,6 +343,12 @@ 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 +======= + apt upgrade -y + apt install -y python3-colcon-metadata python3-pip + rosdep update --rosdistro $ROS_DISTRO + rosdep install -y --from-paths src --ignore-src -y +>>>>>>> 4a2e82c (Fix CI upgrade ROS docker (#489)) - uses: actions/download-artifact@v1 with: From 6de706721be171efde71e41471440f30c59d8f4a Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 31 Mar 2022 09:45:37 +0200 Subject: [PATCH 2/2] fix conflicts Signed-off-by: Pablo Garrido --- .github/workflows/nightly.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c2265ed1..88b435ed 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -334,7 +334,7 @@ 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 @@ -343,12 +343,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 -======= - apt upgrade -y - apt install -y python3-colcon-metadata python3-pip - rosdep update --rosdistro $ROS_DISTRO - rosdep install -y --from-paths src --ignore-src -y ->>>>>>> 4a2e82c (Fix CI upgrade ROS docker (#489)) - uses: actions/download-artifact@v1 with: