Fix Agent and host Rolling CI (#486)

Signed-off-by: Pablo Garrido <pablogs9@gmail.com> (cherry picked from commit d71ce51) # Conflicts: # .github/workflows/ci.yml # .github/workflows/nightly.yml
micro-ROS · Mar 30, 2022 · f17890a · f17890a
1 parent da5ac8b
commit f17890a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,8 +53,14 @@ jobs:
           # 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
+<<<<<<< HEAD
           rosdep update --rosdistro $ROS_DISTRO
           rosdep install -y --from-paths src --ignore-src -y
+=======
+          apt install -y ros-${ROS_DISTRO}-rmw-fastrtps-cpp
+          rosdep update --os=ubuntu:jammy --rosdistro $ROS_DISTRO
+          rosdep install --os=ubuntu:jammy -y --from-paths src --ignore-src -y
+>>>>>>> d71ce51 (Fix Agent and host Rolling CI (#486))
 
       - uses: actions/download-artifact@v1
         with:
@@ -194,9 +200,23 @@ jobs:
       - name: Dependencies
         run: |
           apt update
+<<<<<<< HEAD
           apt install -y python3-colcon-metadata python3-pip
           rosdep update --rosdistro $ROS_DISTRO
           rosdep install -y --from-paths src --ignore-src -y
+=======
+          apt upgrade -y
+          # 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
+          # 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
+          rosdep update --os=ubuntu:jammy --rosdistro $ROS_DISTRO
+          rosdep install --os=ubuntu:jammy -y --from-paths src --ignore-src -y
+>>>>>>> d71ce51 (Fix Agent and host Rolling CI (#486))
 
       - uses: actions/download-artifact@v1
         with:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -379,9 +379,17 @@ 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
+<<<<<<< HEAD
           rosdep update --rosdistro $ROS_DISTRO
           rosdep install -y --from-paths src --ignore-src -y
+=======
+          apt install -y ros-${ROS_DISTRO}-rmw-fastrtps-cpp
+          rosdep update --os=ubuntu:jammy --rosdistro $ROS_DISTRO
+          rosdep install --os=ubuntu:jammy -y --from-paths src --ignore-src -y
+>>>>>>> d71ce51 (Fix Agent and host Rolling CI (#486))
 
       - uses: actions/download-artifact@v1
         with: