Refs #21286: Apply rev suggestions

Signed-off-by: JesusPoderoso <[email protected]>

.github/workflows/mac-ci.yml

@@ -45,7 +45,7 @@ concurrency:
 jobs:
   mac-ci:
     if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
-    uses: ./.github/workflows/reusable-mac-ci.yml
+    uses: ./.github/workflows/reusable-ci.yml
     with:
       # It would be desirable to have a matrix of macos OS for this job, but due to the issue opened in this ticket:
       # https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.

.github/workflows/nightly-mac-ci.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   nightly-mac-ci-master:
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-mac-ci.yml@master
+    uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@master
     with:
       os-version: 'macos-13'
       label: 'nightly-mac-ci-master'
@@ -17,7 +17,7 @@ jobs:
       use-ccache: false
 
   nightly-mac-ci-2_2_x:
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-mac-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'macos-13'
       label: 'nightly-mac-ci-2.2.x'
@@ -27,7 +27,7 @@ jobs:
       use-ccache: false
 
   nightly-mac-ci-2_1_x:
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-mac-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'macos-13'
       label: 'nightly-mac-ci-2.1.x'
@@ -37,7 +37,7 @@ jobs:
       use-ccache: false
 
   nightly-mac-ci-1_1_x:
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-mac-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'macos-13'
       label: 'nightly-mac-ci-1.1.x'
@@ -47,7 +47,7 @@ jobs:
       use-ccache: false
 
   nightly-mac-ci-1_0_x:
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-mac-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'mac-13'
       label: 'nightly-mac-ci-1.0.x'

.github/workflows/nightly-ubuntu-ci.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   nightly-ubuntu-ci-master:
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-ubuntu-ci.yml@master
+    uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@master
     with:
       os-version: 'ubuntu-22.04'
       label: 'nightly-ubuntu-ci-master'
@@ -17,7 +17,7 @@ jobs:
       use-ccache: false
 
   nightly-ubuntu-ci-2_2_x:
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-ubuntu-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'ubuntu-22.04'
       label: 'nightly-ubuntu-ci-2.2.x'
@@ -27,7 +27,7 @@ jobs:
       use-ccache: false
 
   nightly-ubuntu-ci-2_1_x:
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-ubuntu-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'ubuntu-22.04'
       label: 'nightly-ubuntu-ci-2.1.x'
@@ -37,7 +37,7 @@ jobs:
       use-ccache: false
 
   nightly-ubuntu-ci-1_1_x:
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-ubuntu-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'ubuntu-22.04'
       label: 'nightly-ubuntu-ci-1.1.x'
@@ -47,7 +47,7 @@ jobs:
       use-ccache: false
 
   nightly-ubuntu-ci-1_0_x:
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-ubuntu-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'ubuntu-20.04'
       label: 'nightly-ubuntu-ci-1.0.x'

.github/workflows/nightly-windows-ci.yml

@@ -13,7 +13,7 @@ jobs:
         vs-toolset:
           - 'v141'
           - 'v142'
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-windows-ci.yml@master
+    uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@master
     with:
       os-version: 'windows-2019'
       vs-toolset: ${{ matrix.vs-toolset }}
@@ -30,7 +30,7 @@ jobs:
         vs-toolset:
           - 'v141'
           - 'v142'
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-windows-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'windows-2019'
       vs-toolset: ${{ matrix.vs-toolset }}
@@ -47,7 +47,7 @@ jobs:
         vs-toolset:
           - 'v141'
           - 'v142'
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-windows-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'windows-2019'
       vs-toolset: ${{ matrix.vs-toolset }}
@@ -64,7 +64,7 @@ jobs:
         vs-toolset:
           - 'v141'
           - 'v142'
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-windows-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'windows-2019'
       vs-toolset: ${{ matrix.vs-toolset }}
@@ -81,7 +81,7 @@ jobs:
         vs-toolset:
           - 'v141'
           - 'v142'
-    uses: eProsima/Fast-CDR/.github/workflows/reusable-windows-[email protected]
+    uses: eProsima/Fast-CDR/.github/workflows/[email protected]
     with:
       os-version: 'windows-2019'
       vs-toolset: ${{ matrix.vs-toolset }}

.github/workflows/reusable-windows-ci.yml → .github/workflows/reusable-ci.yml

@@ -1,15 +1,15 @@
-name: Fast CDR Windows CI reusable workflow
+name: Fast CDR reusable CI workflow
 
 on:
   workflow_call:
     inputs:
       os-version:
         description: 'The OS image for the workflow'
         required: false
-        default: 'windows-2019'
+        default: 'ubuntu-22.04'
         type: string
       vs-toolset:
-        description: 'Visual Studio toolset to use'
+        description: 'Windows Visual Studio toolset to use (only Windows)'
         required: false
         default: 'v142'
         type: string
@@ -48,12 +48,15 @@ on:
         required: false
         type: boolean
         default: false
+env:
+    toolset: ${{ inputs.vs-toolset && format('-T {0}', inputs.vs-toolset) || '' }}
+    test-meta: ${{ inputs.os-version == 'windows-2019'  && format('{0}/src/fastcdr/.github/workflows/config/build_test.meta', github.workspace) || format('{0}/src/fastcdr/.github/workflows/config/build.meta {0}/src/fastcdr/.github/workflows/config/test.meta', github.workspace)  }}
 defaults:
   run:
     shell: bash
 
 jobs:
-  reusable-windows-ci:
+  fastcdr_test:
     runs-on: ${{ inputs.os-version }}
     if: ${{ inputs.run-build == true }}
     strategy:
@@ -77,11 +80,6 @@ jobs:
         path: src/fastcdr
         ref: ${{ inputs.fastcdr-branch }}
 
-    - name: Sync eProsima/Fast-CDR repository
-      uses: eProsima/eProsima-CI/external/checkout@v0
-      with:
-        path: src/fastcdr
-
     - name: Install Fix Python version
       uses: eProsima/eProsima-CI/external/setup-python@v0
       with:
@@ -95,6 +93,12 @@ jobs:
     - name: Install Colcon dependencies
       uses: eProsima/eProsima-CI/multiplatform/install_colcon@v0
 
+    - name: Setup CCache
+      uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
+      if: ${{ inputs.use-ccache == true }}
+      with:
+        api_token: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Install Python dependencies
       uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0
       with:
@@ -115,12 +119,12 @@ jobs:
         colcon_build_args: ${{ inputs.colcon-args }}
         colcon_build_args_default: --event-handlers=console_direct+
         cmake_args: ${{ inputs.cmake-args }}
-        cmake_args_default: '-T ${{ inputs.vs-toolset }}'
+        cmake_args_default: ${{ env.toolset }}
         cmake_build_type: ${{ matrix.cmake-build-type }}
         workspace: ${{ github.workspace }}
 
     - name: Prepare build test meta file
-      if: ${{ inputs.run-tests == true }}
+      if: ${{ inputs.run-tests == true  && inputs.os-version == 'windows-2019' }}
       uses: eProsima/eProsima-CI/windows/merge_yaml_metas@v0
       with:
         metas: "@('${{ github.workspace }}/src/fastcdr/.github/workflows/config/build.meta', '${{ github.workspace }}/src/fastcdr/.github/workflows/config/windows_test.meta')"
@@ -131,8 +135,8 @@ jobs:
       if: ${{ inputs.run-tests == true }}
       uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
       with:
-        colcon_meta_file: ${{ github.workspace }}/src/fastcdr/.github/workflows/config/build.meta ${{ github.workspace }}/src/fastcdr/.github/workflows/config/test.meta
-        colcon_test_args_default: --event-handlers=console_direct+ --return-code-on-test-failure
+        colcon_meta_file: ${{ env.test-meta }}
+        colcon_test_args_default: --event-handlers=console_direct+
         ctest_args: ${{ inputs.ctest-args }}
         packages_names: fastcdr
         workspace: ${{ github.workspace }}
@@ -147,16 +151,6 @@ jobs:
         show_disabled: 'False'
         show_skipped: 'False'
 
-    - name: Fast CDR Test Report
-      uses: eProsima/eProsima-CI/external/test-reporter@v0
-      if: ${{ !cancelled() && inputs.run-tests == true}}
-      with:
-        name: "Report: ${{ inputs.label }}"
-        path: "${{ steps.test_fastcdr.outputs.ctest_results_path }}*.xml"
-        working-directory: 'src/fastcdr'
-        path-replace-backslashes: 'true'
-        list-tests: 'failed'
-
     - name: Archive Test Results
       if: always()
       uses: eProsima/eProsima-CI/external/upload-artifact@v0