From fadb67b4b4e106cc1078172c5996fd6e8d93b4e2 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Sat, 8 Nov 2025 11:45:33 +0100
Subject: [PATCH] ci: [refactor] Base nowallet task on --preset=dev-mode

This makes it clearer what pieces are disabled over the full dev-mode.

The wallet remains explicitly disabled.
---
 .github/workflows/ci.yml                                  | 4 ++--
 ...ibbitcoinkernel.sh => 00_setup_env_native_nowallet.sh} | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename ci/test/{00_setup_env_native_nowallet_libbitcoinkernel.sh => 00_setup_env_native_nowallet.sh} (76%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 52e77997216..e9870e93468 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -487,11 +487,11 @@ jobs:
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_mac_cross_intel.sh'
 
-          - name: 'No wallet, libbitcoinkernel'
+          - name: 'No wallet'
             cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
             fallback-runner: 'ubuntu-24.04'
             timeout-minutes: 120
-            file-env: './ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh'
+            file-env: './ci/test/00_setup_env_native_nowallet.sh'
 
           - name: 'i686, no IPC'
             cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
diff --git a/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh b/ci/test/00_setup_env_native_nowallet.sh
similarity index 76%
rename from ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh
rename to ci/test/00_setup_env_native_nowallet.sh
index 10417779416..28446a705dc 100755
--- a/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh
+++ b/ci/test/00_setup_env_native_nowallet.sh
@@ -6,11 +6,15 @@
 
 export LC_ALL=C.UTF-8
 
-export CONTAINER_NAME=ci_native_nowallet_libbitcoinkernel
+export CONTAINER_NAME=ci_native_nowallet
 export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
 # Use minimum supported python3.10 (or best-effort 3.12) and clang-17, see doc/dependencies.md
 export PACKAGES="python3-zmq python3-pip clang-17 llvm-17 libc++abi-17-dev libc++-17-dev"
 export PIP_PACKAGES="--break-system-packages pycapnp"
 export DEP_OPTS="NO_WALLET=1 CC=clang-17 CXX='clang++-17 -stdlib=libc++'"
 export GOAL="install"
-export BITCOIN_CONFIG="-DREDUCE_EXPORTS=ON -DBUILD_UTIL_CHAINSTATE=ON -DBUILD_KERNEL_LIB=ON -DBUILD_KERNEL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+export BITCOIN_CONFIG="\
+  --preset=dev-mode \
+  -DREDUCE_EXPORTS=ON \
+  -DENABLE_WALLET=OFF \
+"