Skip to content

Commit 0367a65

Browse files
committed
Refs #21228: Fix test.meta issue in Ubuntu vs Windows
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent b12fc2c commit 0367a65

4 files changed

Lines changed: 14 additions & 7 deletions

File tree

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
names:
2+
fastdds_python:
3+
cmake-args:
4+
- "-DBUILD_TESTING=ON"
5+
- "-DBUILD_DOCUMENTATION=ON"
6+
ctest-args: [
7+
"--repeat", "until-pass:3",
8+
"--timeout", "300",
9+
"--label-exclude", "xfail"
10+
]
File renamed without changes.

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ on:
4747
required: false
4848
type: boolean
4949
default: false
50-
env:
51-
colcon-build-default-cmake-args: '-DBUILD_DOCUMENTATION=ON'
5250
defaults:
5351
run:
5452
shell: bash
@@ -195,18 +193,17 @@ jobs:
195193
continue-on-error: false
196194
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
197195
with:
198-
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build.meta ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/test.meta
196+
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build.meta ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/ubuntu_test.meta
199197
colcon_build_args: ${{ inputs.colcon-args }}
200198
cmake_args: ${{ inputs.cmake-args }}
201-
cmake_args_default: ${{ env.colcon-build-default-cmake-args }}
202199
cmake_build_type: ${{ matrix.cmake-build-type }}
203200
workspace: ${{ github.workspace }}
204201

205202
- name: Colcon test
206203
id: python_test
207204
uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
208205
with:
209-
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/test.meta
206+
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/ubuntu_test.meta
210207
colcon_test_args: ${{ inputs.colcon-args }}
211208
colcon_test_args_default: --event-handlers=console_direct+
212209
ctest_args: ${{ inputs.ctest-args }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ jobs:
236236
- name: Prepare build meta file
237237
uses: eProsima/eProsima-CI/windows/merge_yaml_metas@feature/21228
238238
with:
239-
metas: "@('${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build.meta', '${{ github.workspace }}/src/fastdds_python/.github/workflows/config/test.meta')"
239+
metas: "@('${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build.meta', '${{ github.workspace }}/src/fastdds_python/.github/workflows/config/windows_test.meta')"
240240
path: '${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build_test.meta'
241241

242242
- name: Colcon build
@@ -255,7 +255,7 @@ jobs:
255255
id: python_test
256256
uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
257257
with:
258-
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/test.meta
258+
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/windows_test.meta
259259
colcon_test_args: ${{ inputs.colcon-args }}
260260
colcon_test_args_default: --event-handlers=console_direct+
261261
ctest_args: ${{ inputs.ctest-args }}

0 commit comments

Comments
 (0)