From 7d6682d5364586eaefc9dae6a2e241faa985ea39 Mon Sep 17 00:00:00 2001 From: Zach Laine Date: Thu, 28 Mar 2024 18:29:55 -0500 Subject: [PATCH] Remove C++20 variants from Linux and FreeBSD Drone builds, since libc++ was missing a lot of tuff before Clang 16. --- .drone.star | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.drone.star b/.drone.star index ee8e6f7e..8b8b60c6 100644 --- a/.drone.star +++ b/.drone.star @@ -43,21 +43,21 @@ def main(ctx): job(name='TSAN', tsan=True, compiler='gcc-12', cxxstd='17,20', os='ubuntu-22.04'), job(name='Clang 14 w/ sanitizers', asan=True, ubsan=True, - compiler='clang-14', cxxstd='17,20', os='ubuntu-22.04'), + compiler='clang-14', cxxstd='17', os='ubuntu-22.04'), job(name='Clang 11 libc++ w/ sanitizers', asan=True, ubsan=True, # libc++-11 is the latest working with ASAN: https://github.com/llvm/llvm-project/issues/59432 - compiler='clang-11', cxxstd='17,20', os='ubuntu-20.04', stdlib='libc++', install='libc++-11-dev libc++abi-11-dev'), + compiler='clang-11', cxxstd='17', os='ubuntu-20.04', stdlib='libc++', install='libc++-11-dev libc++abi-11-dev'), # libc++ - job(compiler='clang-10', cxxstd='17,20', os='ubuntu-20.04', stdlib='libc++', install='libc++-10-dev libc++abi-10-dev'), - job(compiler='clang-11', cxxstd='17,20', os='ubuntu-20.04', stdlib='libc++', install='libc++-11-dev libc++abi-11-dev'), - job(compiler='clang-12', cxxstd='17,20', os='ubuntu-22.04', stdlib='libc++', install='libc++-12-dev libc++abi-12-dev libunwind-12-dev'), - job(compiler='clang-13', cxxstd='17,20', os='ubuntu-22.04', stdlib='libc++', install='libc++-13-dev libc++abi-13-dev'), - job(compiler='clang-14', cxxstd='17,20', os='ubuntu-22.04', stdlib='libc++', install='libc++-14-dev libc++abi-14-dev'), - job(compiler='clang-15', cxxstd='17,20', os='ubuntu-22.04', stdlib='libc++', install='libc++-15-dev libc++abi-15-dev', add_llvm=True), + job(compiler='clang-10', cxxstd='17', os='ubuntu-20.04', stdlib='libc++', install='libc++-10-dev libc++abi-10-dev'), + job(compiler='clang-11', cxxstd='17', os='ubuntu-20.04', stdlib='libc++', install='libc++-11-dev libc++abi-11-dev'), + job(compiler='clang-12', cxxstd='17', os='ubuntu-22.04', stdlib='libc++', install='libc++-12-dev libc++abi-12-dev libunwind-12-dev'), + job(compiler='clang-13', cxxstd='17', os='ubuntu-22.04', stdlib='libc++', install='libc++-13-dev libc++abi-13-dev'), + job(compiler='clang-14', cxxstd='17', os='ubuntu-22.04', stdlib='libc++', install='libc++-14-dev libc++abi-14-dev'), + job(compiler='clang-15', cxxstd='17', os='ubuntu-22.04', stdlib='libc++', install='libc++-15-dev libc++abi-15-dev', add_llvm=True), # FreeBSD - job(compiler='clang-10', cxxstd='17,20', os='freebsd-13.1'), - job(compiler='clang-15', cxxstd='17,20', os='freebsd-13.1'), + job(compiler='clang-10', cxxstd='17', os='freebsd-13.1'), + job(compiler='clang-15', cxxstd='17', os='freebsd-13.1'), job(compiler='gcc-11', cxxstd='17,20', os='freebsd-13.1', linkflags='-Wl,-rpath=/usr/local/lib/gcc11'), # OSX job(compiler='clang', cxxstd='17', os='osx-xcode-10.3'), @@ -71,10 +71,10 @@ def main(ctx): job(compiler='clang', cxxstd='17,20,2b', os='osx-xcode-14.3.1'), job(compiler='clang', cxxstd='17,20,2b', os='osx-xcode-15.0.1'), # ARM64 - job(compiler='clang-12', cxxstd='20', os='ubuntu-20.04', arch='arm64', add_llvm=True), + job(compiler='clang-12', cxxstd='17', os='ubuntu-20.04', arch='arm64', add_llvm=True), job(compiler='gcc-11', cxxstd='17,20', os='ubuntu-20.04', arch='arm64'), # S390x - job(compiler='clang-12', cxxstd='20', os='ubuntu-20.04', arch='s390x', add_llvm=True), + job(compiler='clang-12', cxxstd='17', os='ubuntu-20.04', arch='s390x', add_llvm=True), job(compiler='gcc-11', cxxstd='17,20', os='ubuntu-20.04', arch='s390x'), ]