Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21387] Fix windows CI and add vanilla build step in ubuntu CI #5095

Merged
merged 2 commits into from
Jul 23, 2024
Merged

[21387] Fix windows CI and add vanilla build step in ubuntu CI #5095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9475dc
Refs #21387: Fix windows CI
JesusPoderoso Jul 22, 2024
b99eede
Refs #21387: Add vanilla build in ubuntu CI
JesusPoderoso Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/reusable-ubuntu-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,3 +853,14 @@ jobs:
cmake_args_default: ${{ env.colcon-build-default-cmake-args }}
cmake_build_type: ${{ matrix.cmake-build-type }}
workspace: ${{ github.workspace }}

- name: Clean workspace - No shared libs
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 }}
8 changes: 1 addition & 7 deletions .github/workflows/reusable-windows-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,12 @@ jobs:
destination_workspace: src
skip_existing: 'true'

- name: Prepare build meta file
uses: eProsima/eProsima-CI/windows/merge_yaml_metas@v0
with:
metas: "@('${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_build.meta', '${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_test.meta')"
path: '${{ github.workspace }}/src/fastrtps/.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\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
Expand Down
Loading