highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-05-11 22:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#35024: ci: Mitigate network issues in native Windows job

Browse Source 
09c0e37789 ci: Rename vcpkg binary cache entity to force rebuild (Hennadii Stepanov)
dc93091083 ci: Cache `vcpkg/downloads` folder in native Windows CI job (Hennadii Stepanov)
88bbf2ad33 ci, refactor: Reuse primary key in `actions/cache/save` (Hennadii Stepanov)

Pull request description:

  This PR mitigates network issues when vcpkg downloads source tarballs by caching the entire `vcpkg/downloads` directory.

  Closes https://github.com/bitcoin/bitcoin/issues/34996.

ACKs for top commit:
  maflcko:
    review ACK 09c0e37789 📢
  sedited:
    utACK 09c0e37789

Tree-SHA512: 638796e1dc23e2f184852365566dc3feab7023948be506c1cc170d835633cbb0cd94c7c90da2705ab0f2cb2402cdd6acada14f33bae373f459faa4e99892ac5d
This commit is contained in:
merge-script
2026-04-19 12:40:55 +02:00
parent a51ec89e0c 09c0e37789
commit ad0545ba96
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
.github/workflows/ci.yml vendored
View File

@@ -211,7 +211,7 @@ jobs:
with:
path: ${{ env.CCACHE_DIR }}
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
key: ${{ github.job }}-${{ matrix.job-type }}-ccache-${{ github.run_id }}
key: ${{ steps.ccache-cache.outputs.cache-primary-key }}
windows-native-dll:
name: ${{ matrix.job-name }}
@@ -253,20 +253,21 @@ jobs:
py -3 --version
bash --version
- name: Restore vcpkg tools cache
id: vcpkg-tools-cache
- name: Restore vcpkg downloads cache
id: vcpkg-downloads-cache
uses: actions/cache/restore@v5
with:
path: ~/AppData/Local/vcpkg/downloads/tools
key: ${{ github.job }}-vcpkg-tools-${{ github.run_id }}
restore-keys: ${{ github.job }}-vcpkg-tools-
path: |
~/AppData/Local/vcpkg/downloads/*
!~/AppData/Local/vcpkg/downloads/tools
key: ${{ github.job }}-vcpkg-downloads-${{ hashFiles('vcpkg.json') }}
- name: Restore vcpkg binary cache
uses: actions/cache/restore@v5
id: vcpkg-binary-cache
with:
path: ~/AppData/Local/vcpkg/archives
key: ${{ github.job }}-vcpkg-binary-${{ hashFiles('cmake_version', 'msbuild_version', 'toolset_version', 'vcpkg.json') }}
key: ${{ github.job }}-vcpkg-binary-release-${{ hashFiles('cmake_version', 'msbuild_version', 'toolset_version', 'vcpkg.json') }}
- name: Generate build system
run: |
@@ -277,15 +278,17 @@ jobs:
if: github.event_name != 'pull_request' && github.ref_name == github.event.repository.default_branch && steps.vcpkg-binary-cache.outputs.cache-hit != 'true' && matrix.job-type == 'standard'
with:
path: ~/AppData/Local/vcpkg/archives
key: ${{ github.job }}-vcpkg-binary-${{ hashFiles('cmake_version', 'msbuild_version', 'toolset_version', 'vcpkg.json') }}
key: ${{ steps.vcpkg-binary-cache.outputs.cache-primary-key }}
- name: Save vcpkg tools cache
- name: Save vcpkg downloads cache
uses: actions/cache/save@v5
# 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'
# Only save cache from the 'standard' job, as it includes the necessary downloads for other jobs in the matrix. If the matrix is modified, this may need amending.
if: github.event_name != 'pull_request' && github.ref_name == github.event.repository.default_branch && steps.vcpkg-binary-cache.outputs.cache-hit != 'true' && steps.vcpkg-downloads-cache.outputs.cache-hit != 'true' && matrix.job-type == 'standard'
with:
path: ~/AppData/Local/vcpkg/downloads/tools
key: ${{ github.job }}-vcpkg-tools-${{ github.run_id }}
path: |
~/AppData/Local/vcpkg/downloads/*
!~/AppData/Local/vcpkg/downloads/tools # Cache the tools once as archives, but not redundantly in extracted form.
key: ${{ steps.vcpkg-downloads-cache.outputs.cache-primary-key }}
- name: Build
run: |