Refs #21307: TODO REVERT THIS COMMIT - check CMakeCache.txt without p…

…arsing metas Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
eProsima · Jul 18, 2024 · d2ca5ab · d2ca5ab
1 parent 4f4c64f
commit d2ca5ab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/config/fastdds_build.meta b/.github/workflows/config/fastdds_build.meta
@@ -1,4 +1,4 @@
-names:
+names
     fastdds:
         cmake-args:
             - "-DBUILD_DOCUMENTATION=OFF"

diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml
@@ -140,25 +140,32 @@ jobs:
           destination_workspace: src
           skip_existing: 'true'
 
-      - name: Prepare build meta file
-        uses: eProsima/eProsima-CI/windows/merge_yaml_metas@hotfix/21307
-        with:
-          metas: "@('${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta', '${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_test.meta')"
-          path: '${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build_test.meta'
+      #- name: Prepare build meta file
+      #  uses: eProsima/eProsima-CI/windows/merge_yaml_metas@hotfix/21307
+      #  with:
+      #    metas: "@('${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta', '${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_test.meta')"
+      #    path: '${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build_test.meta'
 
       - name: Build
         id: build
         continue-on-error: false
         uses: eProsima/eProsima-CI/windows/colcon_build@v0
         with:
-          colcon_meta_file: ${{ github.workspace }}\src\fastdds\.github\workflows\config\fastdds_build_test.meta
+          #colcon_meta_file: ${{ github.workspace }}\src\fastdds\.github\workflows\config\fastdds_build_test.meta
+          colcon_meta_file: ${{ github.workspace }}\src\fastdds\.github\workflows\config\fastdds_build.meta ${{ github.workspace }}\src\fastdds\.github\workflows\config\fastdds_test.meta
           colcon_build_args: ${{ inputs.colcon-args }}
           # The following Fast DDS CMake options need to be specified here instead of in the meta files
           # because they vary from platform to platform
           cmake_args_default: ${{ inputs.cmake-args }} -T ${{ matrix.vs-toolset }} -DTHIRDPARTY_Asio=FORCE -DTHIRDPARTY_TinyXML2=FORCE -DTHIRDPARTY_fastcdr=OFF -DTHIRDPARTY_UPDATE=ON -DEPROSIMA_EXTRA_CMAKE_CXX_FLAGS="/MP /WX"
           cmake_build_type: ${{ matrix.cmake-config }}
           workspace: ${{ github.workspace }}
 
+      - name: Check the meta arguments
+        run: |
+          $meta = Get-Content -Path $Env:GITHUB_WORKSPACE\build\fastdds\CMakeCache.txt -Raw
+          Write-Host "CMakeCache.txt content:"
+          Write-Host $meta
+
       - name: Test
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') }}
         id: test