From a24ef0c66432081ba63060ee148ff36131d9bc92 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 7 Feb 2022 19:30:06 +0200 Subject: [PATCH] Update Drone files --- .drone.jsonnet | 22 +++++++++++++++++++--- .drone/drone.sh | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index f2f4bad..76aad76 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -9,6 +9,9 @@ local triggers = branch: [ "master", "develop", "feature/*" ] }; +local ubsan = { UBSAN: '1', UBSAN_OPTIONS: 'print_stacktrace=1' }; +local asan = { ASAN: '1' }; + local linux_pipeline(name, image, environment, packages = "", sources = [], arch = "amd64") = { name: name, @@ -172,7 +175,7 @@ local windows_pipeline(name, image, environment, arch = "amd64") = linux_pipeline( "Linux 20.04 Clang 13 UBSAN", "cppalliance/droneubuntu2004:1", - { UBSAN: '1', TOOLSET: 'clang', COMPILER: 'clang++-13', CXXSTD: '03,11,14,17,20' }, + { TOOLSET: 'clang', COMPILER: 'clang++-13', CXXSTD: '03,11,14,17,20' } + ubsan, "clang-13", ["deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main"], ), @@ -180,14 +183,27 @@ local windows_pipeline(name, image, environment, arch = "amd64") = linux_pipeline( "Linux 20.04 Clang 14 UBSAN", "cppalliance/droneubuntu2004:1", - { UBSAN: '1', TOOLSET: 'clang', COMPILER: 'clang++-14', CXXSTD: '03,11,14,17,20' }, + { TOOLSET: 'clang', COMPILER: 'clang++-14', CXXSTD: '03,11,14,17,20' } + ubsan, + "clang-14", + ["deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main"], + ), + + linux_pipeline( + "Linux 20.04 Clang 14 ASAN", + "cppalliance/droneubuntu2004:1", + { TOOLSET: 'clang', COMPILER: 'clang++-14', CXXSTD: '03,11,14,17,20' } + asan, "clang-14", ["deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main"], ), macos_pipeline( "MacOS 10.15 Xcode 12.2 UBSAN", - { UBSAN: '1', TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,1z' }, + { TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,1z' } + ubsan, + ), + + macos_pipeline( + "MacOS 10.15 Xcode 12.2 ASAN", + { TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,1z' } + asan, ), windows_pipeline( diff --git a/.drone/drone.sh b/.drone/drone.sh index 586dc69..f64df96 100755 --- a/.drone/drone.sh +++ b/.drone/drone.sh @@ -21,4 +21,4 @@ python tools/boostdep/depinst/depinst.py $LIBRARY ./b2 -d0 headers echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam -./b2 -j3 libs/$LIBRARY/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${ADDRMD:+address-model=$ADDRMD} ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined define=UBSAN=1 debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS} +./b2 -j3 libs/$LIBRARY/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${ADDRMD:+address-model=$ADDRMD} ${UBSAN:+undefined-sanitizer=norecover debug-symbols=on} ${ASAN:+address-sanitizer=on debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}