oxen-io
/
oxen-mq
mirror of https://github.com/oxen-io/oxen-mq.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Crank clang to 13 

Also reformat and move things around a bit.
This commit is contained in:
Jason Rhinelander 2021-10-13 19:00:19 -03:00
parent 560d38d069
commit 6a386b7d4a
1 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
.drone.jsonnet
View File

@ -1,4 +1,3 @@
local apt_get_quiet = 'apt-get -o=Dpkg::Use-Pty=0 -q '; local apt_get_quiet = 'apt-get -o=Dpkg::Use-Pty=0 -q ';
local debian_pipeline(name, image, arch='amd64', deps='g++ libsodium-dev libzmq3-dev', cmake_extra='', build_type='Release', extra_cmds=[], allow_fail=false) = { local debian_pipeline(name, image, arch='amd64', deps='g++ libsodium-dev libzmq3-dev', cmake_extra='', build_type='Release', extra_cmds=[], allow_fail=false) = {
@ -6,12 +5,12 @@ local debian_pipeline(name, image, arch='amd64', deps='g++ libsodium-dev libzmq3
type: 'docker', type: 'docker',
name: name, name: name,
platform: { arch: arch }, platform: { arch: arch },
environment: { CLICOLOR_FORCE: '1' }, // Lets color through ninja (1.9+) environment: { CLICOLOR_FORCE: '1' }, // Lets color through ninja (1.9+)
steps: [ steps: [
{ {
name: 'build', name: 'build',
image: image, image: image,
[if allow_fail then "failure"]: "ignore", [if allow_fail then 'failure']: 'ignore',
commands: [ commands: [
'echo "Building on ${DRONE_STAGE_MACHINE}"', 'echo "Building on ${DRONE_STAGE_MACHINE}"',
'echo "man-db man-db/auto-update boolean false" | debconf-set-selections', 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections',
@ -22,35 +21,60 @@ local debian_pipeline(name, image, arch='amd64', deps='g++ libsodium-dev libzmq3
'git submodule update --init --recursive', 'git submodule update --init --recursive',
'mkdir build', 'mkdir build',
'cd build', 'cd build',
'cmake .. -G Ninja -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_BUILD_TYPE='+build_type+' -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ' + cmake_extra, 'cmake .. -G Ninja -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_BUILD_TYPE=' + build_type + ' -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ' + cmake_extra,
'ninja -v', 'ninja -v',
'./tests/tests --use-colour yes' './tests/tests --use-colour yes',
] + extra_cmds, ] + extra_cmds,
} },
] ],
}; };
local clang(version) = debian_pipeline(
'Debian sid/clang-' + version + ' (amd64)',
'debian:sid',
deps='clang-13 libsodium-dev libzmq3-dev',
cmake_extra='-DCMAKE_C_COMPILER=clang-13 -DCMAKE_CXX_COMPILER=clang++-13 '
);
local full_llvm(version) = debian_pipeline(
'Debian sid/llvm-' + version + ' (amd64)',
'debian:sid',
deps='clang-13 lld-13 libc++-13-dev libc++abi-13-dev libsodium-dev libzmq3-dev',
cmake_extra='-DCMAKE_C_COMPILER=clang-' + version +
' -DCMAKE_CXX_COMPILER=clang++-' + version +
' -DCMAKE_CXX_FLAGS=-stdlib=libc++ ' +
std.join(' ', [
'-DCMAKE_' + type + '_LINKER_FLAGS=-fuse-ld=lld-' + version
for type in ['EXE', 'MODULE', 'SHARED', 'STATIC']
])
);
[ [
debian_pipeline("Ubuntu focal (amd64)", "ubuntu:focal"), debian_pipeline('Ubuntu focal (amd64)', 'ubuntu:focal'),
debian_pipeline("Ubuntu bionic (amd64)", "ubuntu:bionic", deps='libsodium-dev g++-8', debian_pipeline('Ubuntu bionic (amd64)',
'ubuntu:bionic',
deps='libsodium-dev g++-8',
cmake_extra='-DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8'), cmake_extra='-DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8'),
debian_pipeline("Debian sid (amd64)", "debian:sid"), debian_pipeline('Debian sid (amd64)', 'debian:sid'),
debian_pipeline("Debian sid/Debug (amd64)", "debian:sid", build_type='Debug'), debian_pipeline('Debian sid/Debug (amd64)', 'debian:sid', build_type='Debug'),
debian_pipeline("Debian sid/clang-11 (amd64)", "debian:sid", deps='clang-11 lld-11 libsodium-dev libzmq3-dev', clang(13),
cmake_extra='-DCMAKE_C_COMPILER=clang-11 -DCMAKE_CXX_COMPILER=clang++-11 ' + std.join(' ', [ full_llvm(13),
'-DCMAKE_'+type+'_LINKER_FLAGS=-fuse-ld=lld-11' for type in ['EXE','MODULE','SHARED','STATIC']])), debian_pipeline('Debian buster (amd64)', 'debian:buster'),
debian_pipeline("Debian buster (amd64)", "debian:buster"), debian_pipeline('Debian buster (i386)', 'i386/debian:buster'),
debian_pipeline("Debian buster (i386)", "i386/debian:buster"), debian_pipeline('Ubuntu bionic (ARM64)',
debian_pipeline("Ubuntu bionic (ARM64)", "ubuntu:bionic", arch="arm64", deps='libsodium-dev g++-8', 'ubuntu:bionic',
arch='arm64',
deps='libsodium-dev g++-8',
cmake_extra='-DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8'), cmake_extra='-DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8'),
debian_pipeline("Debian sid (ARM64)", "debian:sid", arch="arm64"), debian_pipeline('Debian sid (ARM64)', 'debian:sid', arch='arm64'),
debian_pipeline("Debian buster (armhf)", "arm32v7/debian:buster", arch="arm64"), debian_pipeline('Debian buster (armhf)', 'arm32v7/debian:buster', arch='arm64'),
{ {
kind: 'pipeline', kind: 'pipeline',
type: 'exec', type: 'exec',
name: 'macOS (Catalina w/macports)', name: 'macOS (Catalina w/macports)',
platform: { os: 'darwin', arch: 'amd64' }, platform: { os: 'darwin', arch: 'amd64' },
environment: { CLICOLOR_FORCE: '1' }, // Lets color through ninja (1.9+) environment: { CLICOLOR_FORCE: '1' }, // Lets color through ninja (1.9+)
steps: [ steps: [
{ {
name: 'build', name: 'build',
@ -60,9 +84,9 @@ local debian_pipeline(name, image, arch='amd64', deps='g++ libsodium-dev libzmq3
'cd build', 'cd build',
'cmake .. -G Ninja -DCMAKE_CXX_FLAGS=-fcolor-diagnostics -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache', 'cmake .. -G Ninja -DCMAKE_CXX_FLAGS=-fcolor-diagnostics -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache',
'ninja -v', 'ninja -v',
'./tests/tests --use-colour yes' './tests/tests --use-colour yes',
], ],
} },
] ],
}, },
] ]