Skip to content

Commit 05957a8

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24516: build, ci: Fix MSVC builds and other improvements
c3296b2 build: Drop `double-conversion` from MSVC dependencies (Hennadii Stepanov) 7ff43e5 ci: Invalidate vcpkg binary cache if dependencies changed (Hennadii Stepanov) 20b6c87 build: Specify `zeromq` port explicitly for MSVC builds (Hennadii Stepanov) Pull request description: The current MSVC builds are broken due to the bug in the `zeromq` [port](microsoft/vcpkg#22681 (comment)). From [IRC](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2022-03-08#787145): > \<sipsorcery> Looks like it's a problem downloading the zeromq dependency from https://patch-diff.githubusercontent.com/raw/zeromq/libzmq/pull/4311.diff > \<dhruv> sipsorcery: I'm definitely misunderstanding, i actually have no clue which file the CI is failing to download. I'll DM you more details. > \<sipsorcery> It's saying the hash of the patch file has changed. > \<dhruv> so we'd need to verify that the change is not malicious and then commit the new hash? > \<sipsorcery> No that dependency is managed by the vcpkg repo. Seems they might be working on it microsoft/vcpkg#22681 (comment) > \<dhruv> ok, thanks This PR fixes this issue with specifying the previous port version [explicitly](https://github.com/microsoft/vcpkg/blob/master/docs/users/versioning.md). The current CI task does not fail due to the cached binaries. --- The second commit makes vcpkg binary cache invalid if dependencies changed. The third commit drops `double-conversion` from dependencies as Qt is configured as follows: ``` Configure summary: Build type: win32-msvc (x86_64, CPU features: sse sse2) Compiler: msvc 193131104 Configuration: sse2 aesni sse3 ssse3 sse4_1 sse4_2 avx avx2 avx512f avx512bw avx512cd avx512dq avx512er avx512ifma avx512pf avx512vbmi avx512vl compile_examples f16c largefile msvc_mp precompile_header rdrnd rdseed shani silent x86SimdAlways release c++11 c++14 c++17 c++1z concurrent no-pkg-config static static_runtime stl Build options: ... Qt Core: DoubleConversion ....................... yes Using system DoubleConversion ........ no ... ``` ACKs for top commit: sipsorcery: tACK c3296b2. Tree-SHA512: 4d694a7d0930889a53eb6ee7a09929f6ffa3f078122b34abe6d75430769bb87c353f7c11146da53c3804e51d4bbfcbb7bc8453f525bcc432928d98eeb66ee35e
2 parents 5e33620 + c3296b2 commit 05957a8

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.cirrus.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ task:
130130
reupload_on_changes: true
131131
fingerprint_script:
132132
- echo %CI_VCPKG_TAG%
133+
- type build_msvc\vcpkg.json
133134
- msbuild -version
134135
populate_script:
135136
- mkdir %VCPKG_DEFAULT_BINARY_CACHE%

build_msvc/vcpkg.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,18 @@
88
"boost-signals2",
99
"boost-test",
1010
"sqlite3",
11-
"double-conversion",
1211
{
1312
"name": "libevent",
1413
"features": ["thread"]
1514
},
1615
"zeromq"
16+
],
17+
"builtin-baseline": "b86c0c35b88e2bf3557ff49dc831689c2f085090",
18+
"overrides": [
19+
{
20+
"name": "zeromq",
21+
"version": "4.3.4",
22+
"port-version": 3
23+
}
1724
]
1825
}

0 commit comments

Comments
 (0)