Skip to content

Commit 4fe49f6

Browse files
committed
ci: Migrate CI scripts to CMake
1 parent 7bb8d32 commit 4fe49f6

24 files changed

+113
-163
lines changed

.github/workflows/ci.yml

+45-102
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,17 @@ jobs:
134134

135135
env:
136136
CCACHE_MAXSIZE: '200M'
137-
CI_CCACHE_VERSION: '4.7.5'
138-
CI_QT_CONF: '-release -silent -opensource -confirm-license -opengl desktop -static -static-runtime -mp -qt-zlib -qt-pcre -qt-libpng -nomake examples -nomake tests -nomake tools -no-angle -no-dbus -no-gif -no-gtk -no-ico -no-icu -no-libjpeg -no-libudev -no-sql-sqlite -no-sql-odbc -no-sqlite -no-vulkan -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip doc -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtsvg -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtx11extras -skip qtxmlpatterns -no-openssl -no-feature-bearermanagement -no-feature-printdialog -no-feature-printer -no-feature-printpreviewdialog -no-feature-printpreviewwidget -no-feature-sql -no-feature-sqlmodel -no-feature-textbrowser -no-feature-textmarkdownwriter -no-feature-textodfwriter -no-feature-xml'
139-
CI_QT_DIR: 'qt-everywhere-src-5.15.11'
140-
CI_QT_URL: 'https://download.qt.io/official_releases/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.zip'
141137
PYTHONUTF8: 1
142138
TEST_RUNNER_TIMEOUT_FACTOR: 40
143139

144140
steps:
145141
- name: Checkout
146142
uses: actions/checkout@v4
147143

144+
- name: Remove non-MSVC tool installations
145+
run: |
146+
Remove-Item -Path "$env:ProgramFiles/CMake" -Recurse -Force
147+
148148
- name: Configure Developer Command Prompt for Microsoft Visual C++
149149
# Using microsoft/setup-msbuild is not enough.
150150
uses: ilammy/msvc-dev-cmd@v1
@@ -153,122 +153,67 @@ jobs:
153153

154154
- name: Get tool information
155155
run: |
156+
cmake --version | Out-File -FilePath "cmake_version"
157+
Get-Content -Path "cmake_version"
158+
Write-Output "---"
156159
msbuild -version | Out-File -FilePath "$env:GITHUB_WORKSPACE\msbuild_version"
157160
Get-Content -Path "$env:GITHUB_WORKSPACE\msbuild_version"
158161
$env:VCToolsVersion | Out-File -FilePath "$env:GITHUB_WORKSPACE\toolset_version"
159162
Write-Host "VCToolsVersion $(Get-Content -Path "$env:GITHUB_WORKSPACE\toolset_version")"
160-
$env:CI_QT_URL | Out-File -FilePath "$env:GITHUB_WORKSPACE\qt_url"
161-
$env:CI_QT_CONF | Out-File -FilePath "$env:GITHUB_WORKSPACE\qt_conf"
162163
py -3 --version
163164
Write-Host "PowerShell version $($PSVersionTable.PSVersion.ToString())"
164165
165-
- name: Restore static Qt cache
166-
id: static-qt-cache
167-
uses: actions/cache/restore@v4
168-
with:
169-
path: C:\Qt_static
170-
key: ${{ github.job }}-static-qt-${{ hashFiles('msbuild_version', 'qt_url', 'qt_conf') }}
171-
172-
- name: Build static Qt. Download
173-
if: steps.static-qt-cache.outputs.cache-hit != 'true'
174-
shell: cmd
175-
run: |
176-
curl --location --output C:\qt-src.zip %CI_QT_URL%
177-
choco install --yes --no-progress jom
178-
179-
- name: Build static Qt. Expand source archive
180-
if: steps.static-qt-cache.outputs.cache-hit != 'true'
181-
shell: cmd
182-
run: tar -xf C:\qt-src.zip -C C:\
183-
184-
- name: Build static Qt. Create build directory
185-
if: steps.static-qt-cache.outputs.cache-hit != 'true'
186-
run: |
187-
Rename-Item -Path "C:\$env:CI_QT_DIR" -NewName "C:\qt-src"
188-
New-Item -ItemType Directory -Path "C:\qt-src\build"
189-
190-
- name: Build static Qt. Configure
191-
if: steps.static-qt-cache.outputs.cache-hit != 'true'
192-
working-directory: C:\qt-src\build
193-
shell: cmd
194-
run: ..\configure %CI_QT_CONF% -prefix C:\Qt_static
195-
196-
- name: Build static Qt. Build
197-
if: steps.static-qt-cache.outputs.cache-hit != 'true'
198-
working-directory: C:\qt-src\build
199-
shell: cmd
200-
run: jom
201-
202-
- name: Build static Qt. Install
203-
if: steps.static-qt-cache.outputs.cache-hit != 'true'
204-
working-directory: C:\qt-src\build
205-
shell: cmd
206-
run: jom install
207-
208-
- name: Save static Qt cache
209-
if: steps.static-qt-cache.outputs.cache-hit != 'true'
210-
uses: actions/cache/save@v4
211-
with:
212-
path: C:\Qt_static
213-
key: ${{ github.job }}-static-qt-${{ hashFiles('msbuild_version', 'qt_url', 'qt_conf') }}
214-
215-
- name: Ccache installation cache
216-
id: ccache-installation-cache
217-
uses: actions/cache@v4
218-
with:
219-
path: |
220-
C:\ProgramData\chocolatey\lib\ccache
221-
C:\ProgramData\chocolatey\bin\ccache.exe
222-
C:\ccache\cl.exe
223-
key: ${{ github.job }}-ccache-installation-${{ env.CI_CCACHE_VERSION }}
224-
225166
- name: Install Ccache
226-
if: steps.ccache-installation-cache.outputs.cache-hit != 'true'
227167
run: |
228-
choco install --yes --no-progress ccache --version=$env:CI_CCACHE_VERSION
229-
New-Item -ItemType Directory -Path "C:\ccache"
230-
Copy-Item -Path "$env:ChocolateyInstall\lib\ccache\tools\ccache-$env:CI_CCACHE_VERSION-windows-x86_64\ccache.exe" -Destination "C:\ccache\cl.exe"
231-
232-
- name: Restore Ccache cache
233-
id: ccache-cache
234-
uses: actions/cache/restore@v4
235-
with:
236-
path: ~/AppData/Local/ccache
237-
key: ${{ github.job }}-ccache-${{ github.run_id }}
238-
restore-keys: ${{ github.job }}-ccache-
168+
choco install --yes --no-progress ccache
239169
240170
- name: Using vcpkg with MSBuild
241171
run: |
242172
Set-Location "$env:VCPKG_INSTALLATION_ROOT"
243-
Add-Content -Path "triplets\x64-windows-static.cmake" -Value "set(VCPKG_BUILD_TYPE release)"
244-
Add-Content -Path "triplets\x64-windows-static.cmake" -Value "set(VCPKG_PLATFORM_TOOLSET_VERSION $env:VCToolsVersion)"
245-
.\vcpkg.exe --vcpkg-root "$env:VCPKG_INSTALLATION_ROOT" integrate install
246-
git rev-parse HEAD | Out-File -FilePath "$env:GITHUB_WORKSPACE\vcpkg_commit"
247-
Get-Content -Path "$env:GITHUB_WORKSPACE\vcpkg_commit"
173+
Add-Content -Path "triplets\x64-windows.cmake" -Value "set(VCPKG_BUILD_TYPE release)"
174+
Add-Content -Path "triplets\x64-windows.cmake" -Value "set(VCPKG_PLATFORM_TOOLSET_VERSION $env:VCToolsVersion)"
248175
249176
- name: vcpkg tools cache
250177
uses: actions/cache@v4
251178
with:
252179
path: C:/vcpkg/downloads/tools
253180
key: ${{ github.job }}-vcpkg-tools
254181

255-
- name: vcpkg binary cache
256-
uses: actions/cache@v4
182+
- name: Restore vcpkg binary cache
183+
uses: actions/cache/restore@v4
184+
id: vcpkg-binary-cache
257185
with:
258186
path: ~/AppData/Local/vcpkg/archives
259-
key: ${{ github.job }}-vcpkg-binary-${{ hashFiles('vcpkg_commit', 'msbuild_version', 'toolset_version', 'build_msvc/vcpkg.json') }}
187+
key: ${{ github.job }}-vcpkg-binary-${{ hashFiles('cmake_version', 'msbuild_version', 'toolset_version', 'vcpkg.json') }}
188+
189+
- name: Generate build system
190+
run: |
191+
cmake -B build --preset vs2022 -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" -DWERROR=ON
260192
261-
- name: Generate project files
262-
run: py -3 build_msvc\msvc-autogen.py
193+
- name: Save vcpkg binary cache
194+
uses: actions/cache/save@v4
195+
if: github.event_name != 'pull_request' && steps.vcpkg-binary-cache.outputs.cache-hit != 'true'
196+
with:
197+
path: ~/AppData/Local/vcpkg/archives
198+
key: ${{ github.job }}-vcpkg-binary-${{ hashFiles('cmake_version', 'msbuild_version', 'toolset_version', 'vcpkg.json') }}
199+
200+
- name: Restore Ccache cache
201+
id: ccache-cache
202+
uses: actions/cache/restore@v4
203+
with:
204+
path: ~/AppData/Local/ccache
205+
key: ${{ github.job }}-ccache-
263206

264207
- name: Build
265-
shell: cmd
208+
working-directory: build
266209
run: |
267210
ccache --zero-stats
268-
msbuild build_msvc\bitcoin.sln -property:CLToolPath=C:\ccache;CLToolExe=cl.exe;UseMultiToolTask=true;Configuration=Release -maxCpuCount -verbosity:minimal -noLogo
211+
cmake --build . -j $env:NUMBER_OF_PROCESSORS --config Release
269212
270213
- name: Ccache stats
271-
run: ccache --show-stats
214+
run: |
215+
ccache --version | head -n 1
216+
ccache --show-stats --verbose
272217
273218
- name: Save Ccache cache
274219
uses: actions/cache/save@v4
@@ -278,20 +223,18 @@ jobs:
278223
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
279224
key: ${{ github.job }}-ccache-${{ github.run_id }}
280225

281-
- name: Run unit tests
282-
run: src\test_bitcoin.exe -l test_suite
283-
284-
- name: Run benchmarks
285-
run: src\bench_bitcoin.exe -sanity-check
286-
287-
- name: Run util tests
288-
run: py -3 test\util\test_runner.py
289-
290-
- name: Run rpcauth test
291-
run: py -3 test\util\rpcauth-test.py
226+
- name: Run test suite
227+
working-directory: build
228+
run: |
229+
ctest -j $env:NUMBER_OF_PROCESSORS -C Release
292230
293231
- name: Run functional tests
232+
working-directory: build
294233
env:
234+
BITCOIND: '${{ github.workspace }}\build\src\Release\bitcoind.exe'
235+
BITCOINCLI: '${{ github.workspace }}\build\src\Release\bitcoin-cli.exe'
236+
BITCOINUTIL: '${{ github.workspace }}\build\src\Release\bitcoin-util.exe'
237+
BITCOINWALLET: '${{ github.workspace }}\build\src\Release\bitcoin-wallet.exe'
295238
TEST_RUNNER_EXTRA: ${{ github.event_name != 'pull_request' && '--extended' || '' }}
296239
shell: cmd
297240
run: py -3 test\functional\test_runner.py --jobs %NUMBER_OF_PROCESSORS% --ci --quiet --tmpdirprefix=%RUNNER_TEMP% --combinedlogslen=99999999 --timeout-factor=%TEST_RUNNER_TIMEOUT_FACTOR% %TEST_RUNNER_EXTRA%

ci/test/00_setup_env.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
6262
# Folder where the build result is put (bin and lib).
6363
export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out}
6464
# Folder where the build is done (dist and out-of-tree build).
65-
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build}
65+
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build-$HOST}
6666
# The folder for previous release binaries.
6767
# This folder exists only on the ci guest, and on the ci host as a volume.
6868
export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:-$BASE_ROOT_DIR/prev_releases}

ci/test/00_setup_env_arm.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export USE_BUSY_BOX=true
1515
export RUN_UNIT_TESTS=true
1616
export RUN_FUNCTIONAL_TESTS=false
1717
export GOAL="install"
18+
export BITCOIN_CONFIG="-DREDUCE_EXPORTS=ON"
1819
# -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
1920
# This could be removed once the ABI change warning does not show up by default
20-
export BITCOIN_CONFIG="--enable-reduce-exports CXXFLAGS=-Wno-psabi"
21+
export BITCOIN_CONFIG_ENV="CXXFLAGS=-Wno-psabi"

ci/test/00_setup_env_i686_centos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ export CI_BASE_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc
1313
export PIP_PACKAGES="pyzmq"
1414
export GOAL="install"
1515
export NO_WERROR=1 # Suppress error: #warning _FORTIFY_SOURCE > 2 is treated like 2 on this platform [-Werror=cpp]
16-
export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports"
16+
export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DWITH_GUI=Qt5 -DREDUCE_EXPORTS=ON"
1717
export CONFIG_SHELL="/bin/dash"

ci/test/00_setup_env_i686_multiprocess.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ export PACKAGES="llvm clang g++-multilib"
1313
export DEP_OPTS="DEBUG=1 MULTIPROCESS=1"
1414
export GOAL="install"
1515
export TEST_RUNNER_EXTRA="--v2transport"
16-
export BITCOIN_CONFIG="--enable-debug CC='clang -m32' CXX='clang++ -m32' \
17-
CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE'"
16+
export BITCOIN_CONFIG="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER='clang;-m32' -DCMAKE_CXX_COMPILER='clang++;-m32'"
17+
export BITCOIN_CONFIG_ENV="CXXFLAGS=-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE"
1818
export BITCOIND=bitcoin-node # Used in functional tests

ci/test/00_setup_env_mac_cross.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ export XCODE_BUILD_ID=15A240d
1717
export RUN_UNIT_TESTS=false
1818
export RUN_FUNCTIONAL_TESTS=false
1919
export GOAL="deploy"
20-
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports"
20+
export BITCOIN_CONFIG="-DWITH_GUI=Qt5 -DREDUCE_EXPORTS=ON"

ci/test/00_setup_env_mac_native.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export HOST=x86_64-apple-darwin
1111
# Therefore, `--break-system-packages` is needed.
1212
export PIP_PACKAGES="--break-system-packages zmq"
1313
export GOAL="install"
14-
export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports"
14+
export BITCOIN_CONFIG="-DWITH_GUI=Qt5 -DWITH_MINIUPNPC=ON -DWITH_NATPMP=ON -DREDUCE_EXPORTS=ON"
1515
export CI_OS_NAME="macos"
1616
export NO_DEPENDS=1
1717
export OSX_SDK=""

ci/test/00_setup_env_native_asan.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ else
1717
fi
1818

1919
export CONTAINER_NAME=ci_native_asan
20-
export PACKAGES="systemtap-sdt-dev clang-18 llvm-18 libclang-rt-18-dev python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
20+
export PACKAGES="systemtap-sdt-dev clang-18 llvm-18 libclang-rt-18-dev python3-zmq qtbase5-dev qttools5-dev qttools5-dev-tools libevent-dev libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
2121
export NO_DEPENDS=1
2222
export GOAL="install"
23-
export BITCOIN_CONFIG="--enable-usdt --enable-zmq --with-incompatible-bdb --with-gui=qt5 \
24-
CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' \
25-
--with-sanitizers=address,float-divide-by-zero,integer,undefined \
26-
CC='clang-18 -ftrivial-auto-var-init=pattern' CXX='clang++-18 -ftrivial-auto-var-init=pattern'"
23+
export BITCOIN_CONFIG="-DWITH_USDT=ON -DWITH_ZMQ=ON -DWARN_INCOMPATIBLE_BDB=OFF -DWITH_GUI=Qt5 \
24+
-DSANITIZERS=address,float-divide-by-zero,integer,undefined \
25+
-DCMAKE_C_COMPILER='clang-18;-ftrivial-auto-var-init=pattern' -DCMAKE_CXX_COMPILER='clang++-18;-ftrivial-auto-var-init=pattern'"
26+
export BITCOIN_CONFIG_ENV="CXXFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER'"

ci/test/00_setup_env_native_fuzz.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export RUN_FUNCTIONAL_TESTS=false
1515
export RUN_FUZZ_TESTS=true
1616
export GOAL="install"
1717
export CI_CONTAINER_CAP="--cap-add SYS_PTRACE" # If run with (ASan + LSan), the container needs access to ptrace (https://github.com/google/sanitizers/issues/764)
18-
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,address,undefined,float-divide-by-zero,integer \
19-
CC='clang-18 -ftrivial-auto-var-init=pattern' CXX='clang++-18 -ftrivial-auto-var-init=pattern'"
18+
export BITCOIN_CONFIG="-DFUZZ=ON -DSANITIZERS=fuzzer,address,undefined,float-divide-by-zero,integer \
19+
-DCMAKE_C_COMPILER='clang-18;-ftrivial-auto-var-init=pattern' -DCMAKE_CXX_COMPILER='clang++-18;-ftrivial-auto-var-init=pattern'"
2020
export CCACHE_MAXSIZE=200M
2121
export LLVM_SYMBOLIZER_PATH="/usr/bin/llvm-symbolizer-18"

ci/test/00_setup_env_native_fuzz_with_msan.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ export PACKAGES="ninja-build"
1717
# BDB generates false-positives and will be removed in future
1818
export DEP_OPTS="DEBUG=1 NO_BDB=1 NO_QT=1 CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
1919
export GOAL="install"
20-
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,memory --disable-hardening CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE'"
20+
export BITCOIN_CONFIG="-DFUZZ=ON -DSANITIZERS=fuzzer,memory -DHARDENING=OFF"
21+
export BITCOIN_CONFIG_ENV="CXXFLAGS=-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE"
2122
export USE_MEMORY_SANITIZER="true"
2223
export RUN_UNIT_TESTS="false"
2324
export RUN_FUNCTIONAL_TESTS="false"

ci/test/00_setup_env_native_fuzz_with_valgrind.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ export RUN_FUNCTIONAL_TESTS=false
1515
export RUN_FUZZ_TESTS=true
1616
export FUZZ_TESTS_CONFIG="--valgrind"
1717
export GOAL="install"
18-
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang-16 CXX=clang++-16"
18+
export BITCOIN_CONFIG="-DFUZZ=ON -DSANITIZERS=fuzzer \
19+
-DCMAKE_C_COMPILER=clang-16 -DCMAKE_CXX_COMPILER=clang++-16"
1920
export CCACHE_MAXSIZE=200M

ci/test/00_setup_env_native_msan.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export PACKAGES="ninja-build"
1717
# BDB generates false-positives and will be removed in future
1818
export DEP_OPTS="DEBUG=1 NO_BDB=1 NO_QT=1 CC=clang CXX=clang++ CFLAGS='${MSAN_FLAGS}' CXXFLAGS='${MSAN_AND_LIBCXX_FLAGS}'"
1919
export GOAL="install"
20-
export BITCOIN_CONFIG="--with-sanitizers=memory --disable-hardening"
20+
export BITCOIN_CONFIG="-DSANITIZERS=memory -DHARDENING=OFF"
2121
export USE_MEMORY_SANITIZER="true"
2222
export RUN_FUNCTIONAL_TESTS="false"
2323
export CCACHE_MAXSIZE=250M

ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ export CI_IMAGE_NAME_TAG="docker.io/ubuntu:22.04"
1212
export PACKAGES="python3-zmq clang-14 llvm-14 libc++abi-14-dev libc++-14-dev"
1313
export DEP_OPTS="NO_WALLET=1 CC=clang-14 CXX='clang++-14 -stdlib=libc++'"
1414
export GOAL="install"
15-
export BITCOIN_CONFIG="--enable-reduce-exports --enable-experimental-util-chainstate --with-experimental-kernel-lib --enable-shared"
15+
export BITCOIN_CONFIG="-DREDUCE_EXPORTS=ON -DBUILD_UTIL_CHAINSTATE=ON -DBUILD_KERNEL_LIB=ON -DBUILD_SHARED_LIBS=ON"

ci/test/00_setup_env_native_previous_releases.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ export RUN_UNIT_TESTS_SEQUENTIAL="true"
1616
export RUN_UNIT_TESTS="false"
1717
export GOAL="install"
1818
export DOWNLOAD_PREVIOUS_RELEASES="true"
19-
export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports --enable-debug \
20-
CFLAGS=\"-g0 -O2 -funsigned-char\" CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE' CXXFLAGS=\"-g0 -O2 -funsigned-char\""
19+
export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DWITH_GUI=Qt5 -DREDUCE_EXPORTS=ON \
20+
-DCMAKE_BUILD_TYPE=Debug \
21+
-DCMAKE_C_FLAGS_DEBUG='-funsigned-char -g0 -O2' \
22+
-DCMAKE_CXX_FLAGS_DEBUG='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE -funsigned-char -g0 -O2'"

ci/test/00_setup_env_native_tidy.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ export LC_ALL=C.UTF-8
99
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1010
export CONTAINER_NAME=ci_native_tidy
1111
export TIDY_LLVM_V="18"
12-
export PACKAGES="clang-${TIDY_LLVM_V} libclang-${TIDY_LLVM_V}-dev llvm-${TIDY_LLVM_V}-dev libomp-${TIDY_LLVM_V}-dev clang-tidy-${TIDY_LLVM_V} jq bear libevent-dev libboost-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev qtbase5-dev qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev"
12+
export PACKAGES="clang-${TIDY_LLVM_V} libclang-${TIDY_LLVM_V}-dev llvm-${TIDY_LLVM_V}-dev libomp-${TIDY_LLVM_V}-dev clang-tidy-${TIDY_LLVM_V} jq libevent-dev libboost-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev systemtap-sdt-dev qtbase5-dev qttools5-dev qttools5-dev-tools libqrencode-dev libsqlite3-dev libdb++-dev"
1313
export NO_DEPENDS=1
1414
export RUN_UNIT_TESTS=false
1515
export RUN_FUNCTIONAL_TESTS=false
1616
export RUN_FUZZ_TESTS=false
1717
export RUN_TIDY=true
1818
export GOAL="install"
19-
export BITCOIN_CONFIG="CC=clang-${TIDY_LLVM_V} CXX=clang++-${TIDY_LLVM_V} --with-incompatible-bdb --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0 -I/usr/lib/llvm-${TIDY_LLVM_V}/lib/clang/${TIDY_LLVM_V}/include'"
19+
export BITCOIN_CONFIG="-DWARN_INCOMPATIBLE_BDB=OFF -DHARDENING=OFF \
20+
-DCMAKE_C_COMPILER=clang-${TIDY_LLVM_V} -DCMAKE_CXX_COMPILER=clang++-${TIDY_LLVM_V} \
21+
-DCMAKE_C_FLAGS_RELWITHDEBINFO='-O0 -g0' -DCMAKE_CXX_FLAGS_RELWITHDEBINFO='-O0 -g0'"
2022
export CCACHE_MAXSIZE=200M

ci/test/00_setup_env_native_tsan.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
1111
export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libc++abi-18-dev libc++-18-dev python3-zmq"
1212
export DEP_OPTS="CC=clang-18 CXX='clang++-18 -stdlib=libc++'"
1313
export GOAL="install"
14-
export BITCOIN_CONFIG="--enable-zmq CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION' --with-sanitizers=thread"
14+
export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DSANITIZERS=thread"
15+
export BITCOIN_CONFIG_ENV="CXXFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION'"

ci/test/00_setup_env_native_valgrind.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ export USE_VALGRIND=1
1313
export NO_DEPENDS=1
1414
export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
1515
export GOAL="install"
16-
export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang-16 CXX=clang++-16" # TODO enable GUI
16+
# TODO enable GUI
17+
export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DWARN_INCOMPATIBLE_BDB=OFF -DWITH_GUI=OFF \
18+
-DCMAKE_C_COMPILER=clang-16 -DCMAKE_CXX_COMPILER=clang++-16"

0 commit comments

Comments
 (0)