From 9a25bc3989396f54cc5de5f1966ae9a8993f96ca Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 2 Jul 2026 11:37:19 +0100 Subject: [PATCH 1/2] ci: use a 8x instance over 16x --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f039997d62..34dd688e2be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -530,7 +530,7 @@ jobs: file-env: './ci/test/00_setup_env_native_msan.sh' - name: 'riscv32 bare metal, static libbitcoin_consensus' - warp-runner: 'warp-ubuntu-latest-x64-16x' + warp-runner: 'warp-ubuntu-latest-x64-8x' fallback-runner: 'ubuntu-latest' timeout-minutes: 120 file-env: './ci/test/00_setup_env_riscv_bare_cross.sh' From 47bbed052e0cb0b13f2ef94e4de471e79bdd5a74 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 2 Jul 2026 11:38:54 +0100 Subject: [PATCH 2/2] ci: use true|false over "true|false" --- ci/test/00_setup_env_native_fuzz_with_msan.sh | 4 ++-- ci/test/00_setup_env_native_previous_releases.sh | 2 +- ci/test/00_setup_env_openbsd_cross.sh | 4 ++-- ci/test/00_setup_env_riscv_bare_cross.sh | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/test/00_setup_env_native_fuzz_with_msan.sh b/ci/test/00_setup_env_native_fuzz_with_msan.sh index c35a93622df..7f6ad82847b 100755 --- a/ci/test/00_setup_env_native_fuzz_with_msan.sh +++ b/ci/test/00_setup_env_native_fuzz_with_msan.sh @@ -28,6 +28,6 @@ export BITCOIN_CONFIG="\ -DAPPEND_CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE -U_FORTIFY_SOURCE' \ " export USE_INSTRUMENTED_LIBCPP="MemoryWithOrigins" -export RUN_UNIT_TESTS="false" -export RUN_FUNCTIONAL_TESTS="false" +export RUN_UNIT_TESTS=false +export RUN_FUNCTIONAL_TESTS=false export RUN_FUZZ_TESTS=true diff --git a/ci/test/00_setup_env_native_previous_releases.sh b/ci/test/00_setup_env_native_previous_releases.sh index d6af52c4bf3..5e189f8c8f4 100755 --- a/ci/test/00_setup_env_native_previous_releases.sh +++ b/ci/test/00_setup_env_native_previous_releases.sh @@ -14,7 +14,7 @@ export DEP_OPTS="CC=gcc-12 CXX=g++-12" export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude feature_dbcrash" # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash export GOAL="install" export CI_LIMIT_STACK_SIZE=1 -export DOWNLOAD_PREVIOUS_RELEASES="true" +export DOWNLOAD_PREVIOUS_RELEASES=true # Use -Werror as the CMake version does not support CMAKE_COMPILE_WARNING_AS_ERROR export BITCOIN_CONFIG="\ --preset=dev-mode \ diff --git a/ci/test/00_setup_env_openbsd_cross.sh b/ci/test/00_setup_env_openbsd_cross.sh index 3d80e28626e..a3ee96fc112 100755 --- a/ci/test/00_setup_env_openbsd_cross.sh +++ b/ci/test/00_setup_env_openbsd_cross.sh @@ -31,5 +31,5 @@ export BITCOIN_CONFIG="\ -DREDUCE_EXPORTS=ON \ -DWITH_USDT=OFF \ " -export RUN_UNIT_TESTS="false" -export RUN_FUNCTIONAL_TESTS="false" +export RUN_UNIT_TESTS=false +export RUN_FUNCTIONAL_TESTS=false diff --git a/ci/test/00_setup_env_riscv_bare_cross.sh b/ci/test/00_setup_env_riscv_bare_cross.sh index b68434087dc..c5459e786e1 100755 --- a/ci/test/00_setup_env_riscv_bare_cross.sh +++ b/ci/test/00_setup_env_riscv_bare_cross.sh @@ -31,7 +31,7 @@ export BITCOIN_CONFIG="-DCMAKE_C_COMPILER=/opt/riscv-ilp32/bin/riscv32-unknown-e -DIFADDR_LINKS_WITHOUT_LIBSOCKET=ON \ " -export BARE_METAL_RISCV="true" -export RUN_UNIT_TESTS="false" -export RUN_FUNCTIONAL_TESTS="false" -export NO_DEPENDS="true" +export BARE_METAL_RISCV=true +export RUN_UNIT_TESTS=false +export RUN_FUNCTIONAL_TESTS=false +export NO_DEPENDS=true