From 62d4636b1c8628798c13872575752cff0cceed6c Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com> Date: Sat, 9 Nov 2024 10:53:36 +0000 Subject: [PATCH] ci: build C++20 target and depends with GCC 14 --- .github/workflows/build.yml | 2 +- .gitlab-ci.yml | 8 +++++++- ci/test/00_setup_env_native_cxx20.sh | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a477f4ffe013f..4b0d54fbd362b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: dep_opts: "DEBUG=1 CC=clang-18 CXX=clang++-18" - build_target: linux64_cxx20 host: x86_64-pc-linux-gnu - dep_opts: "DEBUG=1" + dep_opts: "DEBUG=1 CC=gcc-14 CXX=g++-14" - build_target: linux64_sqlite host: x86_64-pc-linux-gnu dep_opts: "DEBUG=1 NO_BDB=1" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbfa58cdd3db4..ebd2298b98258 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -201,6 +201,12 @@ x86_64-pc-linux-gnu-debug: HOST: x86_64-pc-linux-gnu DEP_OPTS: "DEBUG=1" +x86_64-pc-linux-gnu-gcc14: + extends: .build-depends-template + variables: + HOST: x86_64-pc-linux-gnu + DEP_OPTS: "DEBUG=1 CC=gcc-14 CXX=g++-14" + x86_64-pc-linux-gnu-nowallet: extends: - .build-depends-template @@ -254,7 +260,7 @@ linux64_cxx20-build: - .build-template - .skip-in-fast-mode-template needs: - - x86_64-pc-linux-gnu-debug + - x86_64-pc-linux-gnu-gcc14 variables: BUILD_TARGET: linux64_cxx20 diff --git a/ci/test/00_setup_env_native_cxx20.sh b/ci/test/00_setup_env_native_cxx20.sh index 422da6b4ca401..ca086cff3d105 100755 --- a/ci/test/00_setup_env_native_cxx20.sh +++ b/ci/test/00_setup_env_native_cxx20.sh @@ -8,10 +8,10 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_native_cxx20 export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev" -export DEP_OPTS="NO_UPNP=1 DEBUG=1" +export DEP_OPTS="NO_UPNP=1 DEBUG=1 CC=gcc-14 CXX=g++-14" export CPPFLAGS="-DDEBUG_LOCKORDER -DARENA_DEBUG" export PYZMQ=true export RUN_FUNCTIONAL_TESTS=false export GOAL="install" -export BITCOIN_CONFIG="--enable-zmq --enable-reduce-exports --enable-crash-hooks --enable-c++20" +export BITCOIN_CONFIG="--enable-zmq --enable-reduce-exports --enable-crash-hooks --enable-c++20 CC=gcc-14 CXX=g++-14"