Skip to content

Commit 9f2c657

Browse files
MiguelCompanymergify[bot]
authored andcommitted
Single line for ctest_args in Mac CI (#6186)
Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 5820fca) # Conflicts: # .github/workflows/reusable-mac-ci.yml
1 parent 825fd7f commit 9f2c657

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,15 @@ jobs:
222222
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_test.meta
223223
colcon_test_args: ${{ inputs.colcon-args }}
224224
colcon_test_args_default: --event-handlers=console_direct+
225+
<<<<<<< HEAD
225226
ctest_args: >
226227
${{ inputs.ctest-args }}
227228
${{ format('-E "{0}"', env.test_blocklist) }}
228229
packages_names: fastrtps
230+
=======
231+
ctest_args: ${{ inputs.ctest-args }} ${{ format('-E "{0}"', env.test_blocklist) }}
232+
packages_names: fastdds
233+
>>>>>>> 5820fca8 (Single line for ctest_args in Mac CI (#6186))
229234
workspace: ${{ github.workspace }}
230235
test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}
231236

0 commit comments

Comments
 (0)