From de96bf2cb4ea6f921f25b6446f0dff99741ede3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Poderoso?=
 <120394830+JesusPoderoso@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:15:44 +0100
Subject: [PATCH] Migrate apt package installation action to eProsima-CI
 (#4515)

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 22a574422a6029c60c8aa2218d54f7fca6360364)
---
 .../actions/install-apt-packages/action.yml    | 18 ------------------
 .github/workflows/sanitizer-tests.yaml         | 14 ++++----------
 .github/workflows/thread-sanitizer.yaml        |  7 ++-----
 3 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 .github/actions/install-apt-packages/action.yml

diff --git a/.github/actions/install-apt-packages/action.yml b/.github/actions/install-apt-packages/action.yml
deleted file mode 100644
index fb8cdf89c6d..00000000000
--- a/.github/actions/install-apt-packages/action.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: 'install-apt-packages'
-description: 'Install necessary apt packages'
-runs:
-  using: "composite"
-  steps:
-    - id: install-apt-packages
-      run: |
-        sudo apt-get update
-        sudo apt-get -y install \
-          curl \
-          grep \
-          libasio-dev \
-          libtinyxml2-dev \
-          python3 \
-          python3-pip \
-          software-properties-common \
-          wget
-      shell: bash
diff --git a/.github/workflows/sanitizer-tests.yaml b/.github/workflows/sanitizer-tests.yaml
index 6db60c6c815..f0ab26d2ed2 100644
--- a/.github/workflows/sanitizer-tests.yaml
+++ b/.github/workflows/sanitizer-tests.yaml
@@ -35,10 +35,10 @@ jobs:
         FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || 'master' }}
 
     steps:
-      - name: Install wget
+      - name: Install apt packages
         uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
         with:
-          packages: wget
+          packages: curl grep libasio-dev libtinyxml2-dev python3 python3-pip software-properties-common wget
 
       - name: Setup CCache
         uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
@@ -70,9 +70,6 @@ jobs:
           cd ./src/fastrtps
           git checkout ${{ env.FASTDDS_BRANCH }}
 
-      - name: Install apt packages
-        uses: ./src/fastrtps/.github/actions/install-apt-packages
-
       - name: Install GTest
         uses: eProsima/eProsima-CI/ubuntu/install_gtest@v0
         with:
@@ -124,10 +121,10 @@ jobs:
       DEFAULT_DISCOVERY_SERVER_BRANCH: ${{ github.event.inputs.discovery_server_branch || 'master' }}
 
     steps:
-      - name: Install wget
+      - name: Install apt packages
         uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
         with:
-          packages: wget
+          packages: curl grep libasio-dev libtinyxml2-dev python3 python3-pip software-properties-common wget
 
       - name: Install colcon
         uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0
@@ -163,9 +160,6 @@ jobs:
           repository: eProsima/Discovery-Server
           ref: ${{ env.DEFAULT_DISCOVERY_SERVER_BRANCH }}
 
-      - name: Install apt packages
-        uses: ./src/fastrtps/.github/actions/install-apt-packages
-
       - name: Install GTest
         uses: eProsima/eProsima-CI/ubuntu/install_gtest@v0
         with:
diff --git a/.github/workflows/thread-sanitizer.yaml b/.github/workflows/thread-sanitizer.yaml
index dad72077317..03839ed66b7 100644
--- a/.github/workflows/thread-sanitizer.yaml
+++ b/.github/workflows/thread-sanitizer.yaml
@@ -55,10 +55,10 @@ jobs:
         CXX: g++-12
 
     steps:
-      - name: Install wget
+      - name: Install apt packages
         uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
         with:
-          packages: wget
+          packages: curl grep libasio-dev libtinyxml2-dev python3 python3-pip software-properties-common wget
 
       - name: Setup CCache
         uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
@@ -90,9 +90,6 @@ jobs:
           cd ./src/fastrtps
           git checkout ${{ env.FASTDDS_BRANCH }}
 
-      - name: Install apt packages
-        uses: ./src/fastrtps/.github/actions/install-apt-packages
-
       - name: Install GTest
         uses: eProsima/eProsima-CI/ubuntu/install_gtest@v0
         with: