ci: build C++20 target and depends with GCC 14

dashpay · Nov 10, 2024 · 62d4636 · 62d4636
1 parent ae53553
commit 62d4636
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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"