Skip to content

Commit 9a6445a

Browse files
dr7anadr7ana
committed
ci rework
1 parent 30868b5 commit 9a6445a

File tree

4 files changed

+107
-56
lines changed

4 files changed

+107
-56
lines changed

‎.drone.jsonnet

+71-56
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
local default_deps_base = [
22
'libsystemd-dev',
33
'python3-dev',
4-
'libuv1-dev',
54
'libunbound-dev',
65
'nettle-dev',
76
'libssl-dev',
87
'libevent-dev',
8+
'libfmt-dev',
99
'libsqlite3-dev',
1010
'libcurl4-openssl-dev',
1111
'libzmq3-dev',
@@ -14,7 +14,7 @@ local default_deps_base = [
1414
];
1515
local default_deps_nocxx = ['libsodium-dev'] + default_deps_base; // libsodium-dev needs to be >= 1.0.18
1616
local default_deps = ['g++'] + default_deps_nocxx;
17-
local docker_base = 'registry.oxen.rocks/lokinet-ci-';
17+
local docker_base = 'registry.oxen.rocks/';
1818

1919
local submodule_commands = [
2020
'git fetch --tags',
@@ -287,14 +287,14 @@ local deb_builder(image, distro, distro_branch, arch='amd64', oxen_repo=true) =
287287
};
288288

289289
local clang(version) = debian_pipeline(
290-
'Debian sid/clang-' + version + ' (amd64)',
290+
'Debian sid/clang-' + version + ' [AMD64]',
291291
docker_base + 'debian-sid-clang',
292292
deps=['clang-' + version] + default_deps_nocxx,
293293
cmake_extra='-DCMAKE_C_COMPILER=clang-' + version + ' -DCMAKE_CXX_COMPILER=clang++-' + version + ' '
294294
);
295295

296296
local full_llvm(version) = debian_pipeline(
297-
'Debian sid/llvm-' + version + ' (amd64)',
297+
'Debian sid/llvm-' + version + ' [AMD64]',
298298
docker_base + 'debian-sid-clang',
299299
deps=['clang-' + version, ' lld-' + version, ' libc++-' + version + '-dev', 'libc++abi-' + version + '-dev']
300300
+ default_deps_nocxx,
@@ -310,6 +310,7 @@ local full_llvm(version) = debian_pipeline(
310310
// Macos build
311311
local mac_builder(name,
312312
build_type='Release',
313+
arch='amd64',
313314
werror=true,
314315
cmake_extra='',
315316
local_mirror=true,
@@ -320,7 +321,7 @@ local mac_builder(name,
320321
kind: 'pipeline',
321322
type: 'exec',
322323
name: name,
323-
platform: { os: 'darwin', arch: 'amd64' },
324+
platform: { os: 'darwin', arch: arch },
324325
steps: [
325326
{ name: 'submodules', commands: submodule_commands },
326327
{
@@ -332,10 +333,7 @@ local mac_builder(name,
332333
// basic system headers. WTF apple:
333334
'export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"',
334335
'ulimit -n 1024', // because macos sets ulimit to 256 for some reason yeah idk
335-
'./contrib/mac-configure.sh ' +
336-
ci_dep_mirror(local_mirror) +
337-
'-DWARN_DEPRECATED=OFF ' +
338-
codesign,
336+
'./contrib/mac-configure.sh ' + ci_dep_mirror(local_mirror) + '-DWARN_DEPRECATED=OFF ' + codesign,
339337
'cd build-mac',
340338
// We can't use the 'package' target here because making a .dmg requires an active logged in
341339
// macos gui to invoke Finder to invoke the partitioning tool to create a partitioned (!)
@@ -394,28 +392,78 @@ local docs_pipeline(name, image, extra_cmds=[], allow_fail=false) = {
394392
// docker_base + 'docbuilder',
395393
// extra_cmds=['UPLOAD_OS=docs ./contrib/ci/drone-static-upload.sh']),
396394

397-
// Various debian builds
398-
debian_pipeline('Debian sid (amd64)', docker_base + 'debian-sid'),
399-
debian_pipeline('Debian sid/Debug (amd64)', docker_base + 'debian-sid', build_type='Debug'),
395+
// Debian sid
396+
debian_pipeline('Debian sid [AMD64]', docker_base + 'debian-sid'),
397+
debian_pipeline('Debian sid/debug [AMD64]', docker_base + 'debian-sid', build_type='Debug'),
398+
debian_pipeline('Debian sid [ARM64]', docker_base + 'debian-sid', arch='arm64', jobs=4),
399+
400400
clang(17),
401401
full_llvm(17),
402402
clang(19),
403-
full_llvm(19),
404-
debian_pipeline('Debian stable (i386)', docker_base + 'debian-stable/i386'),
405-
debian_pipeline('Debian bullseye (amd64)',
403+
//full_llvm(19),
404+
405+
// Debian 12
406+
debian_pipeline('Debian 12 static [AMD64]',
407+
docker_base + 'debian-bookworm',
408+
deps=['g++'],
409+
cmake_extra='-DBUILD_STATIC_DEPS=ON -DBUILD_SHARED_LIBS=OFF -DSTATIC_LINK=ON'),
410+
debian_pipeline('Debian 12 [ARMHF]', docker_base + 'debian-bookworm/arm32v7', arch='arm64', jobs=4),
411+
debian_pipeline('Debian 12 [i386]', docker_base + 'debian-bookworm/i386'),
412+
413+
// Debian 11
414+
debian_pipeline('Debian 11 [AMD64]',
406415
docker_base + 'debian-bullseye',
407416
extra_setup=debian_backports('bullseye', ['cmake']) + local_gnutls()),
408-
debian_pipeline('Ubuntu latest (amd64)', docker_base + 'ubuntu-rolling'),
409-
debian_pipeline('Ubuntu LTS (amd64)', docker_base + 'ubuntu-lts'),
410-
debian_pipeline('Ubuntu focal (amd64)',
417+
debian_pipeline('Debian 11 static/debug [AMD64]',
418+
docker_base + 'debian-bullseye',
419+
build_type='Debug',
420+
cmake_extra='-DBUILD_STATIC_DEPS=ON -DBUILD_SHARED_LIBS=OFF -DSTATIC_LINK=ON',
421+
extra_setup=debian_backports('bullseye', ['cmake'])),
422+
423+
// Static debian 11 armhf (upload to builds.lokinet.dev)
424+
debian_pipeline('Debian 11 static [ARMHF]',
425+
docker_base + 'debian-bullseye/arm32v7',
426+
arch='arm64',
427+
deps=['g++', 'python3-dev', 'automake', 'libtool'],
428+
extra_setup=debian_backports('bullseye', ['cmake']),
429+
cmake_extra='-DBUILD_STATIC_DEPS=ON -DBUILD_SHARED_LIBS=OFF -DSTATIC_LINK=ON ' +
430+
'-DCMAKE_CXX_FLAGS="-march=armv7-a+fp -Wno-psabi" -DCMAKE_C_FLAGS="-march=armv7-a+fp" ' +
431+
'-DNATIVE_BUILD=OFF -DWITH_SYSTEMD=OFF -DWITH_BOOTSTRAP=OFF',
432+
extra_cmds=[
433+
'./contrib/ci/drone-check-static-libs.sh',
434+
'UPLOAD_OS=linux-armhf ./contrib/ci/drone-static-upload.sh',
435+
],
436+
allow_fail=true, // XXX FIXME: build currently fails!
437+
jobs=4),
438+
439+
// Ubuntu
440+
debian_pipeline('Ubuntu latest [AMD64]', docker_base + 'ubuntu-rolling'),
441+
debian_pipeline('Ubuntu LTS [AMD64]', docker_base + 'ubuntu-lts'),
442+
debian_pipeline('Ubuntu 22.04 [AMD64]', docker_base + 'ubuntu-jammy'),
443+
debian_pipeline('Ubuntu 20.04 [AMD64]',
411444
docker_base + 'ubuntu-focal',
412445
deps=['g++-10'] + default_deps_nocxx,
413446
extra_setup=kitware_repo('focal') + local_gnutls(),
414447
cmake_extra='-DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10'),
415448

416-
// ARM builds (ARM64 and armhf)
417-
debian_pipeline('Debian sid (ARM64)', docker_base + 'debian-sid', arch='arm64', jobs=4),
418-
debian_pipeline('Debian stable (armhf)', docker_base + 'debian-stable/arm32v7', arch='arm64', jobs=4),
449+
// Static ubuntu focal amd64 build (upload to builds.lokinet.dev)
450+
debian_pipeline('Ubuntu 20.04 static [AMD64]',
451+
docker_base + 'ubuntu-focal',
452+
deps=['g++-10', 'python3-dev', 'automake', 'libtool'],
453+
extra_setup=kitware_repo('focal'),
454+
lto=true,
455+
tests=false,
456+
oxen_repo=true,
457+
cmake_extra='-DBUILD_STATIC_DEPS=ON -DBUILD_SHARED_LIBS=OFF -DSTATIC_LINK=ON ' +
458+
'-DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 ' +
459+
'-DCMAKE_CXX_FLAGS="-march=x86-64 -mtune=haswell" ' +
460+
'-DCMAKE_C_FLAGS="-march=x86-64 -mtune=haswell" ' +
461+
'-DNATIVE_BUILD=OFF -DWITH_SYSTEMD=OFF -DWITH_BOOTSTRAP=OFF -DBUILD_LIBLOKINET=OFF',
462+
extra_cmds=[
463+
'./contrib/ci/drone-check-static-libs.sh',
464+
'./contrib/ci/drone-static-upload.sh',
465+
]),
466+
419467

420468
// cross compile targets
421469
// Aug 11: these are exhibiting some dumb failures in libsodium and external deps, TOFIX later
@@ -430,45 +478,12 @@ local docs_pipeline(name, image, extra_cmds=[], allow_fail=false) = {
430478
//apk_builder('android apk', docker_base + 'flutter', extra_cmds=['UPLOAD_OS=android ./contrib/ci/drone-static-upload.sh']),
431479

432480
// Windows builds (x64)
433-
windows_cross_pipeline('Windows (amd64)',
434-
docker_base + 'debian-bookworm',
481+
windows_cross_pipeline('Windows [AMD64]',
482+
docker_base + 'debian-win32-cross',
435483
extra_cmds=[
436484
'./contrib/ci/drone-static-upload.sh',
437485
]),
438486

439-
// Static build (on focal) which gets uploaded to builds.lokinet.dev:
440-
debian_pipeline('Static (focal amd64)',
441-
docker_base + 'ubuntu-focal',
442-
deps=['g++-10', 'python3-dev', 'automake', 'libtool'],
443-
extra_setup=kitware_repo('focal'),
444-
lto=true,
445-
tests=false,
446-
oxen_repo=true,
447-
cmake_extra='-DBUILD_STATIC_DEPS=ON -DBUILD_SHARED_LIBS=OFF -DSTATIC_LINK=ON ' +
448-
'-DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 ' +
449-
'-DCMAKE_CXX_FLAGS="-march=x86-64 -mtune=haswell" ' +
450-
'-DCMAKE_C_FLAGS="-march=x86-64 -mtune=haswell" ' +
451-
'-DNATIVE_BUILD=OFF -DWITH_SYSTEMD=OFF -DWITH_BOOTSTRAP=OFF -DBUILD_LIBLOKINET=OFF',
452-
extra_cmds=[
453-
'./contrib/ci/drone-check-static-libs.sh',
454-
'./contrib/ci/drone-static-upload.sh',
455-
]),
456-
// Static armhf build (gets uploaded)
457-
debian_pipeline('Static [FIXME] (bullseye armhf)',
458-
docker_base + 'debian-bullseye/arm32v7',
459-
arch='arm64',
460-
deps=['g++', 'python3-dev', 'automake', 'libtool'],
461-
extra_setup=debian_backports('bullseye', ['cmake']),
462-
cmake_extra='-DBUILD_STATIC_DEPS=ON -DBUILD_SHARED_LIBS=OFF -DSTATIC_LINK=ON ' +
463-
'-DCMAKE_CXX_FLAGS="-march=armv7-a+fp -Wno-psabi" -DCMAKE_C_FLAGS="-march=armv7-a+fp" ' +
464-
'-DNATIVE_BUILD=OFF -DWITH_SYSTEMD=OFF -DWITH_BOOTSTRAP=OFF',
465-
extra_cmds=[
466-
'./contrib/ci/drone-check-static-libs.sh',
467-
'UPLOAD_OS=linux-armhf ./contrib/ci/drone-static-upload.sh',
468-
],
469-
allow_fail=true, // XXX FIXME: build currently fails!
470-
jobs=4),
471-
472487
/*
473488
// integration tests
474489
debian_pipeline('Router Hive',

‎CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,12 @@ if(WARNINGS_AS_ERRORS)
184184
list(APPEND warning_flags -Werror -Wno-error=array-bounds)
185185
endif()
186186

187+
# GCC 12's stringop-overflow warnings are really broken, with tons and tons of false positives all
188+
# over the place (not just in our code, but also in its own stdlibc++ code). It's better in 13
189+
# w.r.t. stdlibc++, but our code still throws tons of warnings, so disable it for now.
190+
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12)
191+
list(APPEND warning_flags -Wno-stringop-overflow)
192+
endif()
187193
list(APPEND warning_flags -Wno-deprecated-declarations)
188194

189195
add_library(lokinet-base-internal_warnings INTERFACE)

‎llarp/router/router.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -376,12 +376,17 @@ namespace llarp
376376
// Router config
377377
min_client_outbounds = conf.router.client_router_connections;
378378

379+
// clang-format off
380+
DISABLE_WARNING_PUSH
381+
DISABLE_MAYBE_UNINITIALIZED
379382
std::optional<std::string> paddr = (conf.router.public_ip) ? conf.router.public_ip
380383
: (conf.links.public_addr) ? conf.links.public_addr
381384
: std::nullopt;
382385
std::optional<uint16_t> pport = (conf.router.public_port) ? conf.router.public_port
383386
: (conf.links.public_port) ? conf.links.public_port
384387
: std::nullopt;
388+
DISABLE_WARNING_POP
389+
// clang-format on
385390

386391
if (pport.has_value() and not paddr.has_value())
387392
throw std::runtime_error{"If public-port is specified, public-addr must be as well!"};

‎llarp/util/common.hpp

+25
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,28 @@
77

88
#include <cstdint>
99
#include <cstdlib>
10+
11+
// clang-format off
12+
#if defined(__GNUC__) || defined(__clang__)
13+
#define DO_PRAGMA(X) _Pragma(#X)
14+
#define DISABLE_WARNING_PUSH DO_PRAGMA(GCC diagnostics push)
15+
#define DISABLE_WARNING_POP DO_PRAGMA(GCC diagnostic pop)
16+
#define DISABLE_WARNING(wname) DO_PRAGMA(GCC diagnostic ignored #wname)
17+
#elif defined(_MSC_VER_)
18+
#define DISABLE_WARNING_PUSH __pragma(warning(push))
19+
#define DISABLE_WARNING_POP __pragma(warning(pop))
20+
#define DISABLE_WARNING(wnumber) __pragma(warning(disable : wnumber))
21+
#else
22+
// unknown compiler, ignore suppression directives
23+
#define DISABLE_WARNING_PUSH
24+
#define DISABLE_WARNING_POP
25+
#endif
26+
27+
#if defined(__GNUC__) || defined(__clang__)
28+
#define DISABLE_MAYBE_UNINITIALIZED DISABLE_WARNING(-Wmaybe-uninitialized)
29+
#elif defined(_MSC_VER_)
30+
#define DISABLE_MAYBE_UNINITIALIZED DISABLE_WARNING(C4701)
31+
#else
32+
#define DISABLE_MAYBE_UNINITIALIZED
33+
#endif
34+
// clang-format on

0 commit comments

Comments
 (0)