Fix windows CI and add vanilla build step in ubuntu CI (#5095) (#5099)

* Refs #21387: Fix windows CI Signed-off-by: JesusPoderoso <[email protected]> * Refs #21387: Add vanilla build in ubuntu CI Signed-off-by: JesusPoderoso <[email protected]> --------- Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 55ca0aa) Co-authored-by: Jesús Poderoso <[email protected]>
eProsima · Jul 23, 2024 · 53e903a · 53e903a
1 parent 62a0189
commit 53e903a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml
@@ -696,3 +696,15 @@ jobs:
           cmake_args_default: ${{ env.colcon-build-default-cmake-args }}
           cmake_build_type: ${{ matrix.cmake-build-type }}
           workspace: ${{ github.workspace }}
+
+      - name: Clean workspace - No enforce log info
+        if: ${{ always() }}
+        run: |
+          cd ${{ github.workspace }}
+          rm -rf build install log
+
+      - name: Vanilla colcon build
+        uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
+        with:
+          cmake_build_type: ${{ matrix.cmake-build-type }}
+          workspace: ${{ github.workspace }}
diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml
@@ -141,30 +141,12 @@ jobs:
           destination_workspace: src
           skip_existing: 'true'
 
-      - name: Prepare build meta file
-        run: |
-            $build_meta_file = '${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_build.meta'
-            $test_meta_file = '${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_test.meta'
-            $build_test_meta_file = '${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_build_test.meta'
-
-            # Read the content of the build meta file
-            $build_meta_content = Get-Content -Path $build_meta_file
-
-            # Read the content of the test meta file, starting from line 4 (skipping "name" line [1], cmake project name line [2] and "cmake-args" line [3])
-            $test_meta_content = Get-Content -Path $test_meta_file | Select-Object -Skip 3
-
-            # Combine the content of the build meta file and the test meta file
-            $combined_content = $build_meta_content + $test_meta_content
-
-            # Write the combined content to the build test meta file
-            $combined_content | Out-File -FilePath $build_test_meta_file -Encoding UTF8
-
       - name: Build
         id: build
         continue-on-error: false
         uses: eProsima/eProsima-CI/windows/colcon_build@v0
         with:
-          colcon_meta_file: ${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_build_test.meta
+          colcon_meta_file: ${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_build.meta ${{ github.workspace }}\src\fastrtps\.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