Skip to content

Commit d08bedd

Browse files
committed
Merge bitcoin/bitcoin#30735: ci: Use C++23 in one task
fac587e ci: Use C++23 once for testing (MarcoFalke) fa053ab build: Add Centos Stream 9 EOL URL (MarcoFalke) Pull request description: There are no plans to switch to C++23 anytime soon in the next couple of years. The only place right now that is known to benefit is `src/compat/byteswap.h`. However, it is still useful to test with the option, because deprecated, removed or changed language features, as well as compiler changes that are guarded by the language version will be tested and developers can learn about them upfront. Also includes a minor doc fixup commit. ACKs for top commit: davidgumberg: ACK bitcoin/bitcoin@fac587e TheCharlatan: ACK fac587e Tree-SHA512: 1b81788eb5b4da77715d8b047279de65ae6b8920d5a21fd8cc94c3b0edb588ab8ffb7eaffb2f8b7806045de1d47ca85ca629f49038eca762f3136bf380cf3c87
2 parents 8f761ea + fac587e commit d08bedd

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Ubuntu 22.04 LTS Jammy Jellyfish, https://wiki.ubuntu.com/Releases, EOSS in June 2027:
66
# - CMake 3.22.1, https://packages.ubuntu.com/jammy/cmake
77
#
8-
# Centos Stream 9, EOL in May 2027:
8+
# Centos Stream 9, https://www.centos.org/cl-vs-cs/#end-of-life, EOL in May 2027:
99
# - CMake 3.26.5, https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages/
1010
cmake_minimum_required(VERSION 3.22)
1111
if(POLICY CMP0141)

ci/test/00_setup_env_native_asan.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ export BITCOIN_CONFIG="\
2828
-DCMAKE_C_COMPILER=clang-18 \
2929
-DCMAKE_CXX_COMPILER=clang++-18 \
3030
-DCMAKE_C_FLAGS='-ftrivial-auto-var-init=pattern' \
31-
-DCMAKE_CXX_FLAGS='-ftrivial-auto-var-init=pattern' \
31+
-DCMAKE_CXX_FLAGS='-ftrivial-auto-var-init=pattern -Wno-error=deprecated-declarations' \
32+
-DAPPEND_CXXFLAGS='-std=c++23' \
3233
-DAPPEND_CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' \
3334
"
3435
export CCACHE_MAXSIZE=300M

0 commit comments

Comments
 (0)