mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-06 21:57:54 +02:00
Merge bitcoin/bitcoin#34883: ci: vcpkg-specific cleanups
2d5cedfe12ci: Switch to VS-vendored vcpkg instance (Hennadii Stepanov)9aa5b3c3a3ci: Switch to `x64-windows-release` triplet (Hennadii Stepanov)65882fa68fci: Remove upstreamed vcpkg workaround (Hennadii Stepanov) Pull request description: This PR removes three vcpkg-specific workarounds. See the commit messages for more details. ACKs for top commit: janb84: Concept ACK2d5cedfe12hodlinator: utACK2d5cedfe12Tree-SHA512: 72155eea5210ff001df8fd05ec82687ab5cef65e0e89e7ab79a59ff90da51e5c7c790a41c6c755463b3dba0fdc5561ea9eb410fd69d4a6682f645d72028b3c48
This commit is contained in:
4
.github/ci-windows.py
vendored
4
.github/ci-windows.py
vendored
@@ -71,8 +71,8 @@ def generate(ci_type):
|
||||
"-B",
|
||||
"build",
|
||||
"-Werror=dev",
|
||||
"--preset",
|
||||
"vs2026",
|
||||
"--preset=vs2026",
|
||||
"-DVCPKG_TARGET_TRIPLET=x64-windows-release",
|
||||
] + GENERATE_OPTIONS[ci_type]
|
||||
if run(command, check=False).returncode != 0:
|
||||
print("=== ⚠️ ===")
|
||||
|
||||
14
.github/workflows/ci.yml
vendored
14
.github/workflows/ci.yml
vendored
@@ -253,21 +253,11 @@ jobs:
|
||||
py -3 --version
|
||||
bash --version
|
||||
|
||||
- name: Using vcpkg with MSBuild
|
||||
run: |
|
||||
echo "set(VCPKG_BUILD_TYPE release)" >> "${VCPKG_INSTALLATION_ROOT}/triplets/x64-windows.cmake"
|
||||
# Workaround for libevent, which requires CMake 3.1 but is incompatible with CMake >= 4.0.
|
||||
sed -i '1s/^/set(ENV{CMAKE_POLICY_VERSION_MINIMUM} 3.5)\n/' "${VCPKG_INSTALLATION_ROOT}/scripts/ports.cmake"
|
||||
|
||||
- name: Set VCPKG_ROOT
|
||||
run: |
|
||||
echo "VCPKG_ROOT=${VCPKG_INSTALLATION_ROOT}" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Restore vcpkg tools cache
|
||||
id: vcpkg-tools-cache
|
||||
uses: actions/cache/restore@v5
|
||||
with:
|
||||
path: C:/vcpkg/downloads/tools
|
||||
path: ~/AppData/Local/vcpkg/downloads/tools
|
||||
key: ${{ github.job }}-vcpkg-tools-${{ github.run_id }}
|
||||
restore-keys: ${{ github.job }}-vcpkg-tools-
|
||||
|
||||
@@ -294,7 +284,7 @@ jobs:
|
||||
# Only save cache from one job as they share tools. If the matrix is expanded to jobs with unique tools, this may need amending.
|
||||
if: github.event_name != 'pull_request' && github.ref_name == github.event.repository.default_branch && steps.vcpkg-tools-cache.outputs.cache-hit != 'true' && matrix.job-type == 'standard'
|
||||
with:
|
||||
path: C:/vcpkg/downloads/tools
|
||||
path: ~/AppData/Local/vcpkg/downloads/tools
|
||||
key: ${{ github.job }}-vcpkg-tools-${{ github.run_id }}
|
||||
|
||||
- name: Build
|
||||
|
||||
Reference in New Issue
Block a user