Skip to content

Commit 14ddf61

Browse files
committed
Merge #359: Sync with the main repo
Pull request description: Sync with the main repo up to the latest bitcoin/bitcoin@ab42b2e, which includes the recent changes in the CI. There is no downloadable artifacts support for now. It will be done in a separated PR(s). Additionally: - The code was adjusted to reflect changes from [PR27419](bitcoin/bitcoin#27419), [PR27491](bitcoin/bitcoin#27491), [PR27576](bitcoin/bitcoin#27576) and [PR27636](bitcoin/bitcoin#27636). - Fixed `modernize-use-default-member-init` clang-tidy warnings. - The ARM task has been temporarily disabled until the issue with the depends cache is resolved. Guix builds: ``` e92b8c4c3298165edb1a0e85ee516d52c81af1269405dcbc6520e63069de2363 guix-build-b3261144c892/output/aarch64-linux-gnu/SHA256SUMS.part 939c6c002490d5649bdbfabacd20cd2270b41b20b7b3a254c9fcd5780209900d guix-build-b3261144c892/output/aarch64-linux-gnu/bitcoin-b3261144c892-aarch64-linux-gnu-debug.tar.gz b3c1383fb394997378997bdd2933965cf4ecc694143b4703108ff6ecb946696c guix-build-b3261144c892/output/aarch64-linux-gnu/bitcoin-b3261144c892-aarch64-linux-gnu.tar.gz f43fedf3af666d35e83b84e63cfe19f315f74f01296982f47d8c159385c3b03c guix-build-b3261144c892/output/arm-linux-gnueabihf/SHA256SUMS.part 73b89b0487e8eee474a6c9c96ae0e7ad635cccc332fc062eb5d4ff5555356c3e guix-build-b3261144c892/output/arm-linux-gnueabihf/bitcoin-b3261144c892-arm-linux-gnueabihf-debug.tar.gz b4518dd9396f316de8d7de5181b8b5d1083e0afa9081625c37117472d2559380 guix-build-b3261144c892/output/arm-linux-gnueabihf/bitcoin-b3261144c892-arm-linux-gnueabihf.tar.gz 0213e754408e2a032cef61a946354656f5b5f755f85aeac1ce4b37f1d22528e6 guix-build-b3261144c892/output/arm64-apple-darwin/SHA256SUMS.part 11bc1be1f53dad337565f3c556dd69abc2d702a31e661359daad6ff89225c794 guix-build-b3261144c892/output/arm64-apple-darwin/bitcoin-b3261144c892-arm64-apple-darwin-unsigned.dmg 558d8e805420c7a348759df6f559ca349953646aa28840efafe5a3d245ea917f guix-build-b3261144c892/output/arm64-apple-darwin/bitcoin-b3261144c892-arm64-apple-darwin-unsigned.tar.gz e679ce3f1c80aff11a5eab8890efbd0d396a851875fbd6f93f32eef5cdf06813 guix-build-b3261144c892/output/arm64-apple-darwin/bitcoin-b3261144c892-arm64-apple-darwin.tar.gz 0cb346390dc6620593b1af5b6669ddc3c1a8d2219a51b1697747c5ab24069c27 guix-build-b3261144c892/output/dist-archive/bitcoin-b3261144c892.tar.gz ac8bd2d58d9d0ebe2da1c8efa2d57bd97c3ef2b2590c758edbc4919808c528c5 guix-build-b3261144c892/output/powerpc64-linux-gnu/SHA256SUMS.part cdf8252fa8aca6da61ff6926de5c7e2e6560ab046049c84c26ba44823f83236a guix-build-b3261144c892/output/powerpc64-linux-gnu/bitcoin-b3261144c892-powerpc64-linux-gnu-debug.tar.gz 3b8b5f53d365b5bf962ecd7def9f06b6f13af0e5c9ef69c6d028f1ed772459be guix-build-b3261144c892/output/powerpc64-linux-gnu/bitcoin-b3261144c892-powerpc64-linux-gnu.tar.gz b44e688d233dcb46a7d6d0b1d97979335d3cc559d16190cc5cd647add79298d2 guix-build-b3261144c892/output/powerpc64le-linux-gnu/SHA256SUMS.part ae5c19afefd523cdc171a3f9aa9f707870fd99749c01c01166086619dfd95ece guix-build-b3261144c892/output/powerpc64le-linux-gnu/bitcoin-b3261144c892-powerpc64le-linux-gnu-debug.tar.gz bb581b1444fa1686f8889248af13d1859f2915091cd640bc522185d5ad83e13d guix-build-b3261144c892/output/powerpc64le-linux-gnu/bitcoin-b3261144c892-powerpc64le-linux-gnu.tar.gz bdca0a3c19b5a9a5c72b2b43b07050678d960009d3fa80cf7e0689d508346974 guix-build-b3261144c892/output/riscv64-linux-gnu/SHA256SUMS.part b0b9c91abe2ad0b5ab3b0bfd10c90133d8d75b50aef0a6a98ac2c2ae4219eaa8 guix-build-b3261144c892/output/riscv64-linux-gnu/bitcoin-b3261144c892-riscv64-linux-gnu-debug.tar.gz fcce0ea00f1d9df136dd677cbc468183faa92bd4bfcd4a77cd1c70f1b894b5f0 guix-build-b3261144c892/output/riscv64-linux-gnu/bitcoin-b3261144c892-riscv64-linux-gnu.tar.gz 7be84969950bb9570522be5a37551c01698cd3fb65eca3988fc9bd6867460552 guix-build-b3261144c892/output/x86_64-apple-darwin/SHA256SUMS.part 25203f50aa6a344ad1c6c4a44a48082440bb0af9bf38f0d60506569f216d1672 guix-build-b3261144c892/output/x86_64-apple-darwin/bitcoin-b3261144c892-x86_64-apple-darwin-unsigned.dmg 16c5baaf6d00ed43b0611c86c2d4555d500b3896daa1daac6a567bc2611c39f6 guix-build-b3261144c892/output/x86_64-apple-darwin/bitcoin-b3261144c892-x86_64-apple-darwin-unsigned.tar.gz 86662f39c29b013b576e6555ecb6cbbc98eaa08532a541e22a7ed6b1baf87209 guix-build-b3261144c892/output/x86_64-apple-darwin/bitcoin-b3261144c892-x86_64-apple-darwin.tar.gz fbbc0ad2376431fdc5b214fd63f24a6da907d87f6f11e0833def50c0d45772cd guix-build-b3261144c892/output/x86_64-linux-gnu/SHA256SUMS.part cba8d700f746a6063809570e45d6dc3d5e60ad5f1a28e0f41f8beed8b546a7b1 guix-build-b3261144c892/output/x86_64-linux-gnu/bitcoin-b3261144c892-x86_64-linux-gnu-debug.tar.gz 0a32985a1e26e13ce883a85e4a92cc68bf51ce096f2f6d74ea499a9fa662d7d0 guix-build-b3261144c892/output/x86_64-linux-gnu/bitcoin-b3261144c892-x86_64-linux-gnu.tar.gz 0bd4cc64cd6ad733cdef87cd74d5034e79dd250b72795cebf9c2c63500509457 guix-build-b3261144c892/output/x86_64-w64-mingw32/SHA256SUMS.part 6ed8f2e6c6cf1992d156672707cd2c254754051f88223dd052a9cd9078d84789 guix-build-b3261144c892/output/x86_64-w64-mingw32/bitcoin-b3261144c892-win64-debug.zip 1ea6d7660652e20b2b1529e406be1f606745d35f6a179b006335a19a19aa9a5b guix-build-b3261144c892/output/x86_64-w64-mingw32/bitcoin-b3261144c892-win64-setup-unsigned.exe 41b0f8cbac614e8c555921de60b25a73a75e6bed025de98ca40d3db48c5db6b1 guix-build-b3261144c892/output/x86_64-w64-mingw32/bitcoin-b3261144c892-win64-unsigned.tar.gz 5c68d711782e76f9e4be93b5468c505f022b72ca299532b200e58fe1e51343b1 guix-build-b3261144c892/output/x86_64-w64-mingw32/bitcoin-b3261144c892-win64.zip ``` Top commit has no ACKs. Tree-SHA512: dd18cfb2cfd6fd45b35bef8a0397bccc0752ce946b304bae986006ff09a9a183d6222b0f607e4dd3373992814ae0e61d5ba63cb54fef9a288152edef3d7ea81d
2 parents 67895f7 + b326114 commit 14ddf61

File tree

928 files changed

+28558
-14891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

928 files changed

+28558
-14891
lines changed

.cirrus.yml

Lines changed: 110 additions & 322 deletions
Large diffs are not rendered by default.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ patches often sit for a long time.
4545
<!--
4646
Links for Windows and macOS build artifacts. Replace <PR> with the assigned pull request number.
4747
48-
[![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/unsecure_win_gui.zip?branch=pull/<PR>)
49-
[![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/unsecure_mac_gui.zip?branch=pull/<PR>)
50-
[![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/unsecure_mac_arm64_gui.zip?branch=pull/<PR>)
51-
[![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/unsecure_android_apk.zip?branch=pull/<PR>)
52-
[![ARM32 Android](https://img.shields.io/badge/OS-Android%2032bit-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android32/unsecure_android_32bit_apk.zip?branch=pull/<PR>)
48+
[![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/<PR>)
49+
[![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/<PR>)
50+
[![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/<PR>)
51+
[![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/<PR>)
5352
-->

.github/workflows/ci.yml

Lines changed: 266 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,266 @@
1+
# Copyright (c) 2023 The Bitcoin Core developers
2+
# Distributed under the MIT software license, see the accompanying
3+
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
5+
name: CI
6+
on:
7+
# See: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request.
8+
pull_request:
9+
# See: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#push.
10+
push:
11+
branches:
12+
- '**'
13+
tags-ignore:
14+
- '**'
15+
16+
concurrency:
17+
group: ${{ github.event_name != 'pull_request' && github.run_id || github.ref }}
18+
cancel-in-progress: true
19+
20+
env:
21+
DANGER_RUN_CI_ON_HOST: 1
22+
CI_FAILFAST_TEST_LEAVE_DANGLING: 1 # GHA does not care about dangling processes and setting this variable avoids killing the CI script itself on error
23+
MAKEJOBS: '-j10'
24+
25+
jobs:
26+
macos-native-x86_64:
27+
name: 'macOS 13 native, x86_64, no depends, sqlite only, gui'
28+
# Use latest image, but hardcode version to avoid silent upgrades (and breaks).
29+
# See: https://github.com/actions/runner-images#available-images.
30+
runs-on: macos-13 # Use M1 once available https://github.com/github/roadmap/issues/528
31+
32+
# No need to run on the read-only mirror, unless it is a PR.
33+
if: github.repository != 'bitcoin-core/gui' || github.event_name == 'pull_request'
34+
35+
timeout-minutes: 120
36+
37+
env:
38+
FILE_ENV: './ci/test/00_setup_env_mac_native.sh'
39+
BASE_ROOT_DIR: ${{ github.workspace }}
40+
41+
steps:
42+
- name: Checkout
43+
uses: actions/checkout@v3
44+
45+
- name: Clang version
46+
run: clang --version
47+
48+
- name: Install Homebrew packages
49+
run: brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
50+
51+
- name: Set Ccache directory
52+
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
53+
54+
- name: Restore Ccache cache
55+
uses: actions/cache/restore@v3
56+
with:
57+
path: ${{ env.CCACHE_DIR }}
58+
key: ${{ github.job }}-ccache-${{ github.run_id }}
59+
restore-keys: ${{ github.job }}-ccache-
60+
61+
- name: CI script
62+
run: ./ci/test_run_all.sh
63+
64+
- name: Save Ccache cache
65+
uses: actions/cache/save@v3
66+
if: github.event_name != 'pull_request'
67+
with:
68+
path: ${{ env.CCACHE_DIR }}
69+
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
70+
key: ${{ github.job }}-ccache-${{ github.run_id }}
71+
72+
win64-native:
73+
name: 'Win64 native, VS 2022'
74+
# Use latest image, but hardcode version to avoid silent upgrades (and breaks).
75+
# See: https://github.com/actions/runner-images#available-images.
76+
runs-on: windows-2022
77+
78+
# No need to run on the read-only mirror, unless it is a PR.
79+
if: github.repository != 'bitcoin-core/gui' || github.event_name == 'pull_request'
80+
81+
env:
82+
CCACHE_MAXSIZE: '200M'
83+
CI_CCACHE_VERSION: '4.7.5'
84+
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'
85+
CI_QT_DIR: 'qt-everywhere-src-5.15.5'
86+
CI_QT_URL: 'https://download.qt.io/official_releases/qt/5.15/5.15.5/single/qt-everywhere-opensource-src-5.15.5.zip'
87+
PYTHONUTF8: 1
88+
TEST_RUNNER_TIMEOUT_FACTOR: 40
89+
90+
steps:
91+
- name: Checkout
92+
uses: actions/checkout@v3
93+
94+
- name: Fix Visual Studio installation
95+
# See: https://github.com/actions/runner-images/issues/7832#issuecomment-1617585694.
96+
run: |
97+
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
98+
$InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
99+
$componentsToRemove= @(
100+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM"
101+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM.Spectre"
102+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64"
103+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.ARM64.Spectre"
104+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64"
105+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64.Spectre"
106+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL"
107+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.Spectre"
108+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM"
109+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM.Spectre"
110+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64"
111+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.ATL.ARM64.Spectre"
112+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC"
113+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.Spectre"
114+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM"
115+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM.Spectre"
116+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64"
117+
"Microsoft.VisualStudio.Component.VC.14.35.17.5.MFC.ARM64.Spectre"
118+
)
119+
[string]$workloadArgs = $componentsToRemove | ForEach-Object {" --remove " + $_}
120+
$Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
121+
# should be run twice
122+
$process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
123+
$process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
124+
125+
- name: Configure Developer Command Prompt for Microsoft Visual C++
126+
# Using microsoft/setup-msbuild is not enough.
127+
uses: ilammy/msvc-dev-cmd@v1
128+
with:
129+
arch: x64
130+
131+
- name: Check MSBuild and Qt
132+
run: |
133+
msbuild -version | Out-File -FilePath "$env:GITHUB_WORKSPACE\msbuild_version"
134+
Get-Content -Path "$env:GITHUB_WORKSPACE\msbuild_version"
135+
$env:CI_QT_URL | Out-File -FilePath "$env:GITHUB_WORKSPACE\qt_url"
136+
$env:CI_QT_CONF | Out-File -FilePath "$env:GITHUB_WORKSPACE\qt_conf"
137+
138+
- name: Restore static Qt cache
139+
id: static-qt-cache
140+
uses: actions/cache/restore@v3
141+
with:
142+
path: C:\Qt_static
143+
key: ${{ github.job }}-static-qt-${{ hashFiles('msbuild_version', 'qt_url', 'qt_conf') }}
144+
145+
- name: Build static Qt. Download
146+
if: steps.static-qt-cache.outputs.cache-hit != 'true'
147+
shell: cmd
148+
run: |
149+
curl --location --output C:\qt-src.zip %CI_QT_URL%
150+
choco install --yes --no-progress jom
151+
152+
- name: Build static Qt. Expand source archive
153+
if: steps.static-qt-cache.outputs.cache-hit != 'true'
154+
shell: cmd
155+
run: tar -xf C:\qt-src.zip -C C:\
156+
157+
- name: Build static Qt. Create build directory
158+
if: steps.static-qt-cache.outputs.cache-hit != 'true'
159+
run: |
160+
Rename-Item -Path "C:\$env:CI_QT_DIR" -NewName "C:\qt-src"
161+
New-Item -ItemType Directory -Path "C:\qt-src\build"
162+
163+
- name: Build static Qt. Configure
164+
if: steps.static-qt-cache.outputs.cache-hit != 'true'
165+
working-directory: C:\qt-src\build
166+
shell: cmd
167+
run: ..\configure %CI_QT_CONF% -prefix C:\Qt_static
168+
169+
- name: Build static Qt. Build
170+
if: steps.static-qt-cache.outputs.cache-hit != 'true'
171+
working-directory: C:\qt-src\build
172+
shell: cmd
173+
run: jom
174+
175+
- name: Build static Qt. Install
176+
if: steps.static-qt-cache.outputs.cache-hit != 'true'
177+
working-directory: C:\qt-src\build
178+
shell: cmd
179+
run: jom install
180+
181+
- name: Save static Qt cache
182+
if: steps.static-qt-cache.outputs.cache-hit != 'true'
183+
uses: actions/cache/save@v3
184+
with:
185+
path: C:\Qt_static
186+
key: ${{ github.job }}-static-qt-${{ hashFiles('msbuild_version', 'qt_url', 'qt_conf') }}
187+
188+
- name: Ccache installation cache
189+
id: ccache-installation-cache
190+
uses: actions/cache@v3
191+
with:
192+
path: |
193+
C:\ProgramData\chocolatey\lib\ccache
194+
C:\ProgramData\chocolatey\bin\ccache.exe
195+
C:\ccache\cl.exe
196+
key: ${{ github.job }}-ccache-installation-${{ env.CI_CCACHE_VERSION }}
197+
198+
- name: Install Ccache
199+
if: steps.ccache-installation-cache.outputs.cache-hit != 'true'
200+
run: |
201+
choco install --yes --no-progress ccache --version=$env:CI_CCACHE_VERSION
202+
New-Item -ItemType Directory -Path "C:\ccache"
203+
Copy-Item -Path "$env:ChocolateyInstall\lib\ccache\tools\ccache-$env:CI_CCACHE_VERSION-windows-x86_64\ccache.exe" -Destination "C:\ccache\cl.exe"
204+
205+
- name: Restore Ccache cache
206+
uses: actions/cache/restore@v3
207+
with:
208+
path: ~/AppData/Local/ccache
209+
key: ${{ github.job }}-ccache-${{ github.run_id }}
210+
restore-keys: ${{ github.job }}-ccache-
211+
212+
- name: Using vcpkg with MSBuild
213+
run: |
214+
Set-Location "$env:VCPKG_INSTALLATION_ROOT"
215+
Add-Content -Path "triplets\x64-windows-static.cmake" -Value "set(VCPKG_BUILD_TYPE release)"
216+
vcpkg --vcpkg-root "$env:VCPKG_INSTALLATION_ROOT" integrate install
217+
git rev-parse HEAD | Out-File -FilePath "$env:GITHUB_WORKSPACE\vcpkg_commit"
218+
Get-Content -Path "$env:GITHUB_WORKSPACE\vcpkg_commit"
219+
220+
- name: vcpkg tools cache
221+
uses: actions/cache@v3
222+
with:
223+
path: C:/vcpkg/downloads/tools
224+
key: ${{ github.job }}-vcpkg-tools
225+
226+
- name: vcpkg binary cache
227+
uses: actions/cache@v3
228+
with:
229+
path: ~/AppData/Local/vcpkg/archives
230+
key: ${{ github.job }}-vcpkg-binary-${{ hashFiles('vcpkg_commit', 'msbuild_version', 'build_msvc/vcpkg.json') }}
231+
232+
- name: Generate project files
233+
run: py -3 build_msvc\msvc-autogen.py
234+
235+
- name: Build
236+
shell: cmd
237+
run: |
238+
ccache --zero-stats
239+
msbuild build_msvc\bitcoin.sln -property:CLToolPath=C:\ccache;CLToolExe=cl.exe;UseMultiToolTask=true;Configuration=Release -maxCpuCount -verbosity:minimal -noLogo
240+
241+
- name: Ccache stats
242+
run: ccache --show-stats
243+
244+
- name: Save Ccache cache
245+
uses: actions/cache/save@v3
246+
if: github.event_name != 'pull_request'
247+
with:
248+
path: ~/AppData/Local/ccache
249+
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
250+
key: ${{ github.job }}-ccache-${{ github.run_id }}
251+
252+
- name: Run unit tests
253+
run: src\test_bitcoin.exe -l test_suite
254+
255+
- name: Run benchmarks
256+
run: src\bench_bitcoin.exe -sanity-check
257+
258+
- name: Run util tests
259+
run: py -3 test\util\test_runner.py
260+
261+
- name: Run rpcauth test
262+
run: py -3 test\util\rpcauth-test.py
263+
264+
- name: Run functional tests
265+
shell: cmd
266+
run: py -3 test\functional\test_runner.py --ci --quiet --tmpdirprefix=%RUNNER_TEMP% --combinedlogslen=99999999 --timeout-factor=%TEST_RUNNER_TIMEOUT_FACTOR% --extended --exclude feature_dbcrash

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.16
1+
3.8.17

.style.yapf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ each_dict_entry_on_separate_line=True
107107
i18n_comment=
108108

109109
# The i18n function call names. The presence of this function stops
110-
# reformattting on that line, because the string it has cannot be moved
110+
# reformatting on that line, because the string it has cannot be moved
111111
# away from the i18n comment.
112112
i18n_function_call=
113113

autogen.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,16 @@ fi
1414
command -v autoreconf >/dev/null || \
1515
(echo "configuration failed, please install autoconf first" && exit 1)
1616
autoreconf --install --force --warnings=all
17+
18+
if expr "'$(build-aux/config.guess --timestamp)" \< "'$(depends/config.guess --timestamp)" > /dev/null; then
19+
chmod ug+w build-aux/config.guess
20+
chmod ug+w src/secp256k1/build-aux/config.guess
21+
cp depends/config.guess build-aux
22+
cp depends/config.guess src/secp256k1/build-aux
23+
fi
24+
if expr "'$(build-aux/config.sub --timestamp)" \< "'$(depends/config.sub --timestamp)" > /dev/null; then
25+
chmod ug+w build-aux/config.sub
26+
chmod ug+w src/secp256k1/build-aux/config.sub
27+
cp depends/config.sub build-aux
28+
cp depends/config.sub src/secp256k1/build-aux
29+
fi

build-aux/m4/l_filesystem.m4

Lines changed: 0 additions & 47 deletions
This file was deleted.

build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@SOURCE_FILES@
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
15+
<ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj">
1616
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
1717
</ProjectReference>
1818
<ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj">

build_msvc/bitcoin-qt/bitcoin-qt.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ResourceCompile Include="..\..\src\qt\res\bitcoin-qt-res.rc" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
16+
<ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj">
1717
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
1818
</ProjectReference>
1919
<ProjectReference Include="..\libbitcoin_cli\libbitcoin_cli.vcxproj">

build_msvc/bitcoin-tx/bitcoin-tx.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ClCompile Include="..\..\src\bitcoin-tx.cpp" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
15+
<ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj">
1616
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
1717
</ProjectReference>
1818
<ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj">

build_msvc/bitcoin-util/bitcoin-util.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ClCompile Include="..\..\src\bitcoin-util.cpp" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
15+
<ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj">
1616
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
1717
</ProjectReference>
1818
<ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj">

0 commit comments

Comments
 (0)