Skip to content

Commit 55ca0aa

Browse files
Fix windows CI and add vanilla build step in ubuntu CI (#5095)
* 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]>
1 parent 48f1dc0 commit 55ca0aa

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

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

+11
Original file line numberDiff line numberDiff line change
@@ -853,3 +853,14 @@ jobs:
853853
cmake_args_default: ${{ env.colcon-build-default-cmake-args }}
854854
cmake_build_type: ${{ matrix.cmake-build-type }}
855855
workspace: ${{ github.workspace }}
856+
857+
- name: Clean workspace - No shared libs
858+
run: |
859+
cd ${{ github.workspace }}
860+
rm -rf build install log
861+
862+
- name: Vanilla colcon build
863+
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
864+
with:
865+
cmake_build_type: ${{ matrix.cmake-build-type }}
866+
workspace: ${{ github.workspace }}

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -141,18 +141,12 @@ jobs:
141141
destination_workspace: src
142142
skip_existing: 'true'
143143

144-
- name: Prepare build meta file
145-
uses: eProsima/eProsima-CI/windows/merge_yaml_metas@v0
146-
with:
147-
metas: "@('${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_build.meta', '${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_test.meta')"
148-
path: '${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_build_test.meta'
149-
150144
- name: Build
151145
id: build
152146
continue-on-error: false
153147
uses: eProsima/eProsima-CI/windows/colcon_build@v0
154148
with:
155-
colcon_meta_file: ${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_build_test.meta
149+
colcon_meta_file: ${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_build.meta ${{ github.workspace }}\src\fastrtps\.github\workflows\config\fastdds_test.meta
156150
colcon_build_args: ${{ inputs.colcon-args }}
157151
# The following Fast DDS CMake options need to be specified here instead of in the meta files
158152
# because they vary from platform to platform

0 commit comments

Comments
 (0)