From 14398f453700651a20a89d54700c86bf828e74ad Mon Sep 17 00:00:00 2001 From: PengZheng Date: Mon, 24 Jun 2024 15:35:53 +0800 Subject: [PATCH] Fix ctest dynamic linking error. --- .github/workflows/conan_create.yml | 2 +- .github/workflows/containers.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan_create.yml b/.github/workflows/conan_create.yml index 8fcc68c31..25f542019 100644 --- a/.github/workflows/conan_create.yml +++ b/.github/workflows/conan_create.yml @@ -110,7 +110,7 @@ jobs: ${{ runner.os }}-ccache-Release- - name: Create Celix run: | - conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:build_all=True -o celix/*:enable_ccache=True -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -tf examples/conan_test_package_v2 -o celix/*:celix_cxx17=True -o celix/*:celix_install_deprecated_api=True + conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:build_all=True -o celix/*:enable_ccache=True -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -tf examples/conan_test_package_v2 -o celix/*:celix_cxx17=True -o celix/*:celix_install_deprecated_api=True -o celix:enable_address_sanitizer=True - name: Dependency Deduction Test run: | conan inspect . | awk 'BEGIN { FS="[\t:]+"; output=0 } /build/ && !/build_all/ && !/build_rsa_remote_service_admin_shm_v2/ && !/build_rsa_discovery_zeroconf/ { if(output) print $1} /^options/ {output=1} /^options_definitions/ {output=0}' | while read option; do conan build . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:${option}=True -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -of ${option}_dir -o celix/*:celix_cxx17=True -o celix/*:enable_ccache=True -o celix/*:celix_install_deprecated_api=True || exit 1; done diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 2d1a3d9c1..570609998 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -56,7 +56,8 @@ jobs: docker run --rm -v ~/.conan2-container:/root/.conan2 -v $(pwd):/workspace \ apache/celix-conan-build:latest /bin/bash -c \ "cd /workspace/build && \ - ctest --output-on-failure --test-command ./conanrun.sh" + source conanrun.sh && \ + ctest --output-on-failure" container-apt-build-ubuntu: runs-on: ubuntu-22.04