Refs #21286: Try to fix windows CI

Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Jul 11, 2024 · c9d13ff · c9d13ff
1 parent 419224e
commit c9d13ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/config/build.meta b/.github/workflows/config/build.meta
@@ -2,3 +2,9 @@ names:
     fastcdr:
         cmake-args:
             - "-DBUILD_TESTING=ON"
+    googletest-distribution:
+        cmake-args:
+            - "-Dgtest_force_shared_crt=ON"
+            - "-DBUILD_SHARED_LIBS=ON"
+            - "-DBUILD_GMOCK=ON"
+
diff --git a/.github/workflows/config/test.meta b/.github/workflows/config/test.meta
@@ -5,8 +5,3 @@ names:
             "--timeout", "300",
             "--output-junit", "junit/junit.xml"
         ]
-    googletest-distribution:
-        cmake-args:
-            - "-Dgtest_force_shared_crt=ON"
-            - "-DBUILD_SHARED_LIBS=ON"
-            - "-DBUILD_GMOCK=ON"
diff --git a/.github/workflows/reusable-ci.yml b/.github/workflows/reusable-ci.yml
@@ -126,7 +126,7 @@ jobs:
       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')"
+        metas: "@('${{ github.workspace }}/src/fastcdr/.github/workflows/config/build.meta', '${{ github.workspace }}/src/fastcdr/.github/workflows/config/test.meta')"
         path: '${{ github.workspace }}/src/fastcdr/.github/workflows/config/build_test.meta'
 
     - name: Colcon test