Skip to content

Commit

Permalink
Temporal fix for cmake update (#428)
Browse files Browse the repository at this point in the history
* Update README.md (#386) (#388)

(cherry picked from commit a4c138e)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Remove references to log4cxx (#389)

* Add android support config (#396) (#405)

Signed-off-by: Joel Cao <joel.cao@oppo.com>

Co-authored-by: Joel Cao <joel.cao@oppo.com>
(cherry picked from commit 967e7ad)

Co-authored-by: kneep <alvin.cao@gmail.com>

* 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 <pablogs9@gmail.com>
Co-authored-by: kneep <alvin.cao@gmail.com>
  • Loading branch information
4 people authored Nov 19, 2021
1 parent 21e0a46 commit fa579fd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,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
Expand Down

0 comments on commit fa579fd

Please sign in to comment.