From 21f80073bb083b56fa282baf7af89ff0cd85b860 Mon Sep 17 00:00:00 2001 From: light7734 Date: Fri, 18 Jul 2025 23:43:18 +0330 Subject: [PATCH] ci: update lsan dockerfile --- tools/ci/images/leak_sanitizer/Dockerfile | 34 +++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/tools/ci/images/leak_sanitizer/Dockerfile b/tools/ci/images/leak_sanitizer/Dockerfile index c85f961..bf5e456 100644 --- a/tools/ci/images/leak_sanitizer/Dockerfile +++ b/tools/ci/images/leak_sanitizer/Dockerfile @@ -49,21 +49,19 @@ RUN git clone --depth=1 https://github.com/llvm/llvm-project.git -b llvmorg-20.1 && ninja -C . install-cxx install-cxxabi \ && rm -r /llvm-project/ -# RUN git clone 'https://git.light7734.com/light7734/light.git' --recursive \ -# && cd light \ -# && conan install . \ -# -s build_type=Release \ -# -s compiler=clang \ -# -s compiler.version=20 \ -# -s compiler.libcxx=libc++ \ -# -c tools.system.package_manager:mode=install \ -# -c tools.cmake.cmaketoolchain:generator=Ninja \ -# -c tools.build:cxxflags='["-g", "-fno-omit-frame-pointer", "-isystem", "/libcxx_lsan/include", "-fsanitize=leak"]' \ -# -c tools.build:cflags='["-g", "-fno-omit-frame-pointer", "-isystem", "/libcxx_lsan/include", "-fsanitize=leak"]' \ -# -c tools.build:sharedlinkflags='["-L/libcxx_lsan/lib", "-Wl,-rpath,/libcxx_lsan/lib", "-lc++", "-lc++abi", "-fsanitize=leak"]' \ -# -c tools.build:exelinkflags='["-L/libcxx_lsan/lib", "-Wl,-rpath,/libcxx_lsan/lib", "-lc++", "-lc++abi", "-fsanitize=leak"]' \ -# -c tools.info.package_id:confs='["tools.build:cxxflags","tools.build:sharedlinkflags","tools.build:exelinkflags"]' \ -# -c tools.build:compiler_executables='{"c": "clang", "cpp": "clang++"}' \ -# --build=missing - -ENTRYPOINT ["bash"] +RUN git clone 'https://git.light7734.com/light7734/light.git' --recursive \ + && cd light \ + && conan install . \ + -s build_type=Release \ + -s compiler=clang \ + -s compiler.version=20 \ + -s compiler.libcxx=libc++ \ + -c tools.system.package_manager:mode=install \ + -c tools.cmake.cmaketoolchain:generator=Ninja \ + -c tools.build:cxxflags='["-g", "-fno-omit-frame-pointer", "-nostdinc++", "-isystem", "/libcxx_lsan/include/c++/v1/", "-fsanitize=leak"]' \ + -c tools.build:sharedlinkflags='["-L/libcxx_lsan/lib", "-Wl,-rpath,/libcxx_lsan/lib", "-lc++", "-lc++abi", "-fsanitize=leak"]' \ + -c tools.build:exelinkflags='["-L/libcxx_lsan/lib", "-Wl,-rpath,/libcxx_lsan/lib", "-lc++", "-lc++abi", "-fsanitize=leak"]' \ + -c tools.info.package_id:confs='["tools.build:cxxflags","tools.build:sharedlinkflags","tools.build:exelinkflags"]' \ + -c tools.build:compiler_executables='{"c": "clang", "cpp": "clang++"}' \ + --build=missing +