From 193bb91019a170400e6eb8bb83a82e65f6d6ac92 Mon Sep 17 00:00:00 2001 From: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com> Date: Fri, 19 Nov 2021 11:57:06 +0100 Subject: [PATCH] Temporal fix for cmake update (#428) * Update README.md (#386) (#388) (cherry picked from commit a4c138e3d86e5a6be21088086dc5ab0d015ef31e) Co-authored-by: Pablo Garrido * Remove references to log4cxx (#389) * Add android support config (#396) (#405) Signed-off-by: Joel Cao Co-authored-by: Joel Cao (cherry picked from commit 967e7ad8e0993312d0c92eb4ff8fe28a9a243d70) Co-authored-by: kneep * Temporal fix for cmake update * Fix rebase * Add fix to regular CI Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Pablo Garrido Co-authored-by: kneep (cherry picked from commit fa579fdd7c29da63f02ca4ad62677d9ff37e6c9c) --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0754b6c3..7eeb9015 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -196,7 +196,7 @@ jobs: 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 install -y python3-colcon-metadata python3-pip cmake-data=3.21.3-0kitware1ubuntu20.04.1 cmake rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 14b243b1..a2096b1a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -339,7 +339,7 @@ jobs: 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 install -y python3-colcon-metadata python3-pip cmake-data=3.21.3-0kitware1ubuntu20.04.1 cmake rosdep update --rosdistro $ROS_DISTRO rosdep install -y --from-paths src --ignore-src -y