diff --git a/.drone.jsonnet b/.drone.jsonnet index e9ed87f25e2..e834bea9cf2 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -51,6 +51,7 @@ local debian_pipeline(name, extra_cmds=[], extra_steps=[], jobs=6, + kitware_cmake_distro='', allow_fail=false) = { kind: 'pipeline', type: 'docker', @@ -69,6 +70,15 @@ local debian_pipeline(name, apt_get_quiet + ' update', apt_get_quiet + ' install -y eatmydata', 'eatmydata ' + apt_get_quiet + ' dist-upgrade -y', + ] + ( + if kitware_cmake_distro != '' then + [ + 'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y curl ca-certificates', + 'curl https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - >/etc/apt/trusted.gpg.d/kitware.gpg', + 'echo deb https://apt.kitware.com/ubuntu/ ' + kitware_cmake_distro + ' main >/etc/apt/sources.list.d/kitware.list', + apt_get_quiet + ' update', + ] else [] + ) + [ 'eatmydata ' + apt_get_quiet + ' install -y --no-install-recommends cmake git ninja-build ccache ' + (if test_oxend then 'gdb ' else '') + std.join(' ', deps), 'mkdir build', @@ -252,6 +262,7 @@ local gui_wallet_step_darwin = { build_tests=false, lto=true, extra_cmds=static_check_and_upload, + kitware_cmake_distro='bionic', /*extra_steps=[gui_wallet_step('ubuntu:bionic')]*/ ), diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index 07e2527646a..7ae355beb5d 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake @@ -27,11 +27,11 @@ set(READLINE_SOURCE readline-${READLINE_VERSION}.tar.gz) set(READLINE_HASH SHA512=27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00 CACHE STRING "readline source hash") -set(SQLITE3_VERSION 3380200 CACHE STRING "sqlite3 version") +set(SQLITE3_VERSION 3390200 CACHE STRING "sqlite3 version") set(SQLITE3_MIRROR ${LOCAL_MIRROR} https://www.sqlite.org/2022 CACHE STRING "sqlite3 download mirror(s)") set(SQLITE3_SOURCE sqlite-autoconf-${SQLITE3_VERSION}.tar.gz) -set(SQLITE3_HASH SHA512=2192675d8638a933ec75ec78dc4185f005c9d37453bc2bbe590b72235066f68ba2cac1be3b491a47d6a7ca74d5b3bfe4e548d576a6b324383bb9bc7739d0b635 +set(SQLITE3_HASH SHA512=c16b50ade3c182d5473014ac0a51e2bb8a5cfc46e532c2bda77ae4d530336e2b57aa4f12dccb6aa2148d60e9289305bf20842ac95dc52f2d31df8eb5f0599de6 CACHE STRING "sqlite3 source hash") if(SQLITE3_VERSION MATCHES "^([0-9]+)(0([0-9])|([1-9][0-9]))(0([0-9])|([1-9][0-9]))[0-9][0-9]$") @@ -95,11 +95,11 @@ set(ZLIB_SOURCE zlib-${ZLIB_VERSION}.tar.gz) set(ZLIB_HASH SHA512=cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 CACHE STRING "zlib source hash") -set(CURL_VERSION 7.82.0 CACHE STRING "curl version") +set(CURL_VERSION 7.85.0 CACHE STRING "curl version") set(CURL_MIRROR ${LOCAL_MIRROR} https://curl.se/download https://curl.askapache.com CACHE STRING "curl mirror(s)") set(CURL_SOURCE curl-${CURL_VERSION}.tar.xz) -set(CURL_HASH SHA256=0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c +set(CURL_HASH SHA512=b57cc31649a4f47cc4b482f56a85c86c8e8aaeaf01bc1b51b065fdb9145a9092bc52535e52a85a66432eb163605b2edbf5bc5c33ea6e40e50f26a69ad1365cbd CACHE STRING "curl source hash") diff --git a/external/libuv b/external/libuv index e8b7eb6908a..0c1fa696aa5 160000 --- a/external/libuv +++ b/external/libuv @@ -1 +1 @@ -Subproject commit e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2 +Subproject commit 0c1fa696aa502eb749c2c4735005f41ba00a27b8 diff --git a/external/oxen-encoding b/external/oxen-encoding index 79193e58fb2..707a83609fb 160000 --- a/external/oxen-encoding +++ b/external/oxen-encoding @@ -1 +1 @@ -Subproject commit 79193e58fb26624d40cd2e95156f78160f2b9b3e +Subproject commit 707a83609fb64d09b61ed1e56c82bf692050d2a1 diff --git a/external/oxen-mq b/external/oxen-mq index 5c72a57eca1..a93c16af04e 160000 --- a/external/oxen-mq +++ b/external/oxen-mq @@ -1 +1 @@ -Subproject commit 5c72a57eca120750ecf557ce5a668fb38242956b +Subproject commit a93c16af04eba58fba2bf7f5726c4669c290bd46