From f92db8f581fdef839565cef1fdf6b41e959d9929 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Mon, 22 Apr 2024 20:49:36 +0000
Subject: [PATCH] Noble is now supported by setup-ros

---
 .github/workflows/reusable-build-coverage.yml | 67 ++++++-------------
 1 file changed, 22 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/reusable-build-coverage.yml b/.github/workflows/reusable-build-coverage.yml
index 3d07c75..77803ec 100644
--- a/.github/workflows/reusable-build-coverage.yml
+++ b/.github/workflows/reusable-build-coverage.yml
@@ -29,61 +29,38 @@ jobs:
           DEBIAN_FRONTEND=noninteractive apt update && apt upgrade -y
           apt install -y sudo apt-utils
           echo "need_node=$(command -v node >/dev/null 2>&1 && echo 0 || echo 1)" >> $GITHUB_OUTPUT
-          echo "need_python=$(command -v python3 >/dev/null 2>&1 && echo 0 || echo 1)" >> $GITHUB_OUTPUT
-          echo "need_rosdep=$(command -v rosdep >/dev/null 2>&1 && echo 0 || echo 1)" >> $GITHUB_OUTPUT
-          echo "need_ros=$(if [ -d "/opt/ros/${{ inputs.ros_distro }}" ]; then echo 0; else echo 1; fi)" >> $GITHUB_OUTPUT
 
       # needed for github actions, and only if a bare ubuntu image is used
-      # Consider switching to https://github.com/actions/setup-node when it works
-      # https://github.com/nektos/act/issues/973
-      # - uses: actions/setup-node@v4
-      #   if: ${{ steps.prereq.outputs.need_node == '1' }}
-      #   with:
-      #     node-version: 16
+      - uses: actions/setup-node@v4
+        if: ${{ steps.prereq.outputs.need_node == '1' && !env.ACT }}
+        # with:
+        #   node-version: 16
       - name: Install node
-        if: ${{ steps.prereq.outputs.need_node == '1' }}
+        # Consider switching to https://github.com/actions/setup-node when it works
+        # https://github.com/nektos/act/issues/973
+        if: ${{ steps.prereq.outputs.need_node == '1' && env.ACT }}
+
+        # - name: Temporary fix for rolling@jammy by setting the ROSDISTRO_INDEX_URL
+        #   # see https://docs.ros.org/en/rolling/How-To-Guides/Using-Custom-Rosdistro.html
+        #   run: |
+        #     if [[ "${{ inputs.ros_distro }}" == "rolling" ]]; then
+        #       sudo sed -i "s|ros\/rosdistro\/master|ros\/rosdistro\/rolling\/2024-02-28|" /etc/ros/rosdep/sources.list.d/20-default.list
+        #       echo "ROSDISTRO_INDEX_URL=https://raw.githubusercontent.com/ros/rosdistro/rolling/2024-02-28/index-v4.yaml" >> $GITHUB_ENV
+        #     fi
+        # - name: Test some rosdep commands to see if the step above worked
+        #   run: |
+        #     rosdep update
+        #     echo "ROS_DISTRO: $ROS_DISTRO"
+        #     rosdep resolve test_msgs std_msgs || true
+        #     rosdep resolve test_msgs std_msgs --os=ubuntu:jammy --rosdistro=rolling
+
         run: |
           apt install -y curl
           curl -sS https://webi.sh/node | sh
           echo ~/.local/opt/node/bin >> $GITHUB_PATH
 
-      # not working for noble yet
-      # - uses: actions/setup-python@v5
-      #   with:
-      #     python-version: '3.11'
-      # needed only if a bare ubuntu image is used
-      - name: Install python
-        if: ${{ steps.prereq.outputs.need_python == '1' }}
-        run: |
-          DEBIAN_FRONTEND=noninteractive apt install -y python3-pip
-
-      # why is this necessary for ros:rolling-ros-core-noble?
-      # and why does this not work with setup-ros?
-      - name: Install ros-dev-tools
-        if: ${{ steps.prereq.outputs.need_rosdep == '1' }}
-        run: |
-          apt install -y ros-dev-tools \
-          python3-colcon-common-extensions python3-colcon-mixin python3-colcon-coveragepy-result
-          rosdep init
-
       # needed only if a non-ros image is used
       - uses: ros-tooling/setup-ros@0.7.2
-        if: ${{ steps.prereq.outputs.need_ros == '1' }}
-
-      # - name: Temporary fix for rolling@jammy by setting the ROSDISTRO_INDEX_URL
-      #   # see https://docs.ros.org/en/rolling/How-To-Guides/Using-Custom-Rosdistro.html
-      #   run: |
-      #     if [[ "${{ inputs.ros_distro }}" == "rolling" ]]; then
-      #       sudo sed -i "s|ros\/rosdistro\/master|ros\/rosdistro\/rolling\/2024-02-28|" /etc/ros/rosdep/sources.list.d/20-default.list
-      #       echo "ROSDISTRO_INDEX_URL=https://raw.githubusercontent.com/ros/rosdistro/rolling/2024-02-28/index-v4.yaml" >> $GITHUB_ENV
-      #     fi
-      # - name: Test some rosdep commands to see if the step above worked
-      #   run: |
-      #     rosdep update
-      #     echo "ROS_DISTRO: $ROS_DISTRO"
-      #     rosdep resolve test_msgs std_msgs || true
-      #     rosdep resolve test_msgs std_msgs --os=ubuntu:jammy --rosdistro=rolling
-
       - uses: actions/checkout@v4
       - id: package_list_action
         uses: ros-controls/ros2_control_ci/.github/actions/set-package-list@master