Skip to content

Commit 7834a88

Browse files
authored
Fix compilation on PDPTests (#6226)
* Refs #24034. Fix Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #24034. Add job for testing NO_TLS=ON Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent ace4426 commit 7834a88

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,21 @@ jobs:
914914
cd ${{ github.workspace }}
915915
rm -rf build install log
916916
917+
- name: No TLS colcon build
918+
uses: eProsima/eProsima-CI/ubuntu/colcon_build@v0
919+
with:
920+
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta
921+
colcon_build_args: ${{ inputs.colcon-args }}
922+
cmake_args: '-DNO_TLS=ON ${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}'
923+
cmake_args_default: ${{ env.colcon-build-default-cmake-args }}
924+
cmake_build_type: ${{ matrix.cmake-build-type }}
925+
workspace: ${{ github.workspace }}
926+
927+
- name: Clean workspace - No TLS
928+
run: |
929+
cd ${{ github.workspace }}
930+
rm -rf build install log
931+
917932
- name: GCC latest colcon build
918933
run: |
919934
cd ${{ github.workspace }}/src/fastdds/.github/workflows/docker/ubuntu/alternative_builds

test/unittest/rtps/discovery/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,6 @@ target_link_libraries(PDPTests
194194
$<$<BOOL:${WIN32}>:ws2_32>
195195
$<$<BOOL:${QNX}>:socket>
196196
${CMAKE_DL_LIBS}
197-
$<$<BOOL:${TLS_FOUND}>:OpenSSL::SSL$<SEMICOLON>OpenSSL::Crypto>)
197+
$<$<BOOL:${LINK_SSL}>:OpenSSL::SSL$<SEMICOLON>OpenSSL::Crypto>)
198198

199199
gtest_discover_tests(PDPTests)

0 commit comments

Comments
 (0)