Refs #20091: Cleanup workflow

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
eProsima · Feb 18, 2024 · ac15421 · ac15421
1 parent d2177da
commit ac15421
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/.github/workflows/fastcdr-test.yml b/.github/workflows/fastcdr-test.yml
@@ -12,6 +12,7 @@ on:
   push:
     branches:
       - master
+      - 1.1.x
       - 1.0.x
 
   workflow_dispatch:
@@ -30,6 +31,7 @@ on:
   pull_request:
     branches:
       - master
+      - 1.1.x
       - 1.0.x
     paths-ignore:
       - '**.md'
@@ -60,7 +62,14 @@ jobs:
     - name: Sync eProsima/Fast-CDR repository
       uses: eProsima/eProsima-CI/external/checkout@feature/fastdds_mac_ci_support
       with:
-          path: src/Fast-CDR
+        path: src/Fast-CDR
+
+    - name: Sync GTest
+      uses: eProsima/eProsima-CI/external/checkout@feature/fastdds_mac_ci_support
+      with:
+        path: src/googletest
+        repository: google/googletest
+        ref: 'release-1.12.1'
 
     - uses: eProsima/eProsima-CI/external/setup-python@feature/fastdds_mac_ci_support
       with:
@@ -74,19 +83,6 @@ jobs:
     - name: Install Colcon dependencies
       uses: eProsima/eProsima-CI/multiplatform/install_colcon@feature/fastdds_mac_ci_support
 
-    # Temporal step as this platform will be discontinued soon
-    - name: Install Gtest Backwards Compatibility
-      if: ${{ matrix.runner-image == 'ubuntu-20.04' || matrix.runner-image == 'macos-13' }}
-      run: |
-          git clone --branch release-1.12.1 https://github.com/google/googletest.git src/googletest && \
-          colcon build \
-            --event-handlers=console_direct+ \
-            --packages-select googletest-distribution
-
-    - name: Install Gtest
-      if: ${{ matrix.runner-image != 'ubuntu-20.04' && matrix.runner-image != 'macos-13' }}
-      uses: eProsima/eProsima-CI/multiplatform/install_gtest@feature/fastdds_mac_ci_support
-
     - name: Colcon build
       uses: eProsima/eProsima-CI/multiplatform/colcon_build@feature/fastdds_mac_ci_support
       with:
@@ -110,7 +106,7 @@ jobs:
       uses: eProsima/eProsima-CI/multiplatform/junit_summary@feature/fastdds_mac_ci_support
       if: ${{ !cancelled() && !contains(github.event.pull_request.labels.*.name, 'no-test') }}
       with:
-        junit_reports_dir: "${{ steps.test.outputs.ctest_results_path }}"
+        junit_reports_dir: ${{ steps.test.outputs.ctest_results_path }}
         print_summary: 'True'
         show_failed: 'True'
         show_disabled: 'False'