mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-09 15:18:03 +02:00
Merge bitcoin/bitcoin#35031: ci: Match VCPKG_HOST_TRIPLET to VCPKG_TARGET_TRIPLET
c74c6cfd84ci: Match `VCPKG_HOST_TRIPLET` to `VCPKG_TARGET_TRIPLET` (Hennadii Stepanov) Pull request description: Using a non-default target triplet in https://github.com/bitcoin/bitcoin/pull/34883 introduced a [regression](https://github.com/bitcoin/bitcoin/pull/34883#issuecomment-4204744932) because packages with `"host": true` in their vcpkg configurations were still picking up the default `x64-windows` triplet, effectively building both release and debug packages. This PR fixes this regression by setting `VCPKG_HOST_TRIPLET` explicitly. Upstream issue: https://github.com/microsoft/vcpkg/issues/50927. ACKs for top commit: hodlinator: utACKc74c6cfd84Tree-SHA512: ee17d800a2db16eccfd2751da296c0c30d4d41f60e94513098be96116aedd83efe258349be824ff1f571c11adffac6a72e4a0c9b8b7278ab736d453ff7c089d6
This commit is contained in:
5
.github/ci-windows.py
vendored
5
.github/ci-windows.py
vendored
@@ -72,6 +72,11 @@ def generate(ci_type):
|
||||
"build",
|
||||
"-Werror=dev",
|
||||
"--preset=vs2026",
|
||||
# Using x64-windows-release for both host and target triplets
|
||||
# to ensure vcpkg builds only release packages, thereby optimizing
|
||||
# build time.
|
||||
# See https://github.com/microsoft/vcpkg/issues/50927.
|
||||
"-DVCPKG_HOST_TRIPLET=x64-windows-release",
|
||||
"-DVCPKG_TARGET_TRIPLET=x64-windows-release",
|
||||
] + GENERATE_OPTIONS[ci_type]
|
||||
if run(command, check=False).returncode != 0:
|
||||
|
||||
Reference in New Issue
Block a user