From 67b27ee344c29e94841c0ff02d0413e0c192ff44 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Tue, 17 Jun 2025 18:45:41 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20Update=20CI=20image=20to=20provide=20glo?= =?UTF-8?q?bal.conf=20for=20sanitizers=20to=20affect=20=E2=80=A6=20(#2233)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …package_id --- docker/ci/Dockerfile | 3 +++ docker/ci/conan/global.conf | 1 + docker/ci/conan/sanitizer_template.profile | 16 +++++++++------- 3 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 docker/ci/conan/global.conf diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile index 20aed296..db60e0e7 100644 --- a/docker/ci/Dockerfile +++ b/docker/ci/Dockerfile @@ -87,6 +87,9 @@ WORKDIR /root # Setup conan RUN conan remote add --index 0 ripple http://18.143.149.228:8081/artifactory/api/conan/dev +WORKDIR /root/.conan2 +COPY conan/global.conf ./global.conf + WORKDIR /root/.conan2/profiles COPY conan/clang.profile ./clang diff --git a/docker/ci/conan/global.conf b/docker/ci/conan/global.conf new file mode 100644 index 00000000..c61cf077 --- /dev/null +++ b/docker/ci/conan/global.conf @@ -0,0 +1 @@ +tools.info.package_id:confs = ["tools.build:cflags", "tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags"] diff --git a/docker/ci/conan/sanitizer_template.profile b/docker/ci/conan/sanitizer_template.profile index 9d70d17e..5f015335 100644 --- a/docker/ci/conan/sanitizer_template.profile +++ b/docker/ci/conan/sanitizer_template.profile @@ -2,17 +2,19 @@ {% set sanitizer_opt_map = {'asan': 'address', 'tsan': 'thread', 'ubsan': 'undefined'} %} {% set sanitizer = sanitizer_opt_map[sani] %} -{% set sanitizer_build_flags = "-fsanitize=" ~ sanitizer ~ " -g -O1 -fno-omit-frame-pointer" %} -{% set sanitizer_link_flags = "-fsanitize=" ~ sanitizer %} +{% set sanitizer_build_flags_str = "-fsanitize=" ~ sanitizer ~ " -g -O1 -fno-omit-frame-pointer" %} +{% set sanitizer_build_flags = sanitizer_build_flags_str.split(' ') %} +{% set sanitizer_link_flags_str = "-fsanitize=" ~ sanitizer %} +{% set sanitizer_link_flags = sanitizer_link_flags_str.split(' ') %} include({{ compiler }}) [options] -boost/*:extra_b2_flags = "cxxflags=\"{{ sanitizer_build_flags }}\" linkflags=\"{{ sanitizer_link_flags }}\"" +boost/*:extra_b2_flags = "cxxflags=\"{{ sanitizer_build_flags_str }}\" linkflags=\"{{ sanitizer_link_flags_str }}\"" boost/*:without_stacktrace = True [conf] -tools.build:cflags += ["{{ sanitizer_build_flags }}"] -tools.build:cxxflags += ["{{ sanitizer_build_flags }}"] -tools.build:exelinkflags += ["{{ sanitizer_link_flags }}"] -tools.build:sharedlinkflags += ["{{ sanitizer_link_flags }}"] +tools.build:cflags += {{ sanitizer_build_flags }} +tools.build:cxxflags += {{ sanitizer_build_flags }} +tools.build:exelinkflags += {{ sanitizer_link_flags }} +tools.build:sharedlinkflags += {{ sanitizer_link_flags }}