Skip to content

Commit 1dbf335

Browse files
committed
Merge bitcoin#17793: ci: Update GitHub Actions CI vcpkg cache on MSBuild update
0b5a366 ci: Update vcpkg cache on MSBuild update (Hennadii Stepanov) b6fa752 ci: Update Qt binaries for GitHub Actions (Hennadii Stepanov) Pull request description: On master (0cda557) Visual Studio update in GitHub Actions CI virtual environment could break a build as the `vcpkg` cache is not updated accordingly (see bitcoin#17788). This PR: - force vcpkg cache update on MSBuild update - is an alternative to bitcoin#17789 - fixes bitcoin#17788 ACKs for top commit: fanquake: ACK 0b5a366 Tree-SHA512: b9e69cb5184a3bbee4c7b14ac35985145a9fd3403d0e449d79f15c18e9660cafec495d639f5f730e0c69dde5f4a3d7590b4e42d385e794cd02add1f4e3b785e7
2 parents 0cda557 + 0b5a366 commit 1dbf335

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

.github/workflows/ci.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
runs-on: windows-latest
88
env:
99
PYTHONUTF8: 1
10-
QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/v1.4/Qt5.9.8_x64_static_vs2019.zip'
11-
QT_DOWNLOAD_HASH: 'f285cbb02bec3b3f3cc2621e3fa7d5edf0d6a66fa30c57859e583acda954ea80'
10+
QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/v1.6/Qt5.9.8_x64_static_vs2019.zip'
11+
QT_DOWNLOAD_HASH: '9a8c6eb20967873785057fdcd329a657c7f922b0af08c5fde105cc597dd37e21'
1212
QT_LOCAL_PATH: 'C:\Qt5.9.8_x64_static_vs2019'
1313
VCPKG_INSTALL_PATH: "$env:VCPKG_INSTALLATION_ROOT/installed"
1414
PLATFORM: x64
@@ -19,11 +19,17 @@ jobs:
1919
with:
2020
python-version: '3.7' # Needed for PEP 540
2121

22+
- name: Setup MSBuild.exe
23+
uses: warrenbuckley/Setup-MSBuild@v1
24+
25+
- name: Check MSBuild.exe
26+
run: MSBuild.exe -version | Out-File -FilePath $env:GITHUB_WORKSPACE\MSBuild_version
27+
2228
- uses: actions/cache@v1
2329
id: vcpkgcache
2430
with:
2531
path: C:/vcpkg/installed
26-
key: ${{ runner.os }}-vcpkg
32+
key: ${{ runner.os }}-vcpkg-${{ hashFiles('MSBuild_version') }}
2733

2834
- name: Update vcpkg and install packages
2935
if: steps.vcpkgcache.outputs.cache-hit != 'true'
@@ -54,8 +60,6 @@ jobs:
5460
}
5561
- name: Generate project files
5662
run: python build_msvc\msvc-autogen.py
57-
- name: Setup MSBuild.exe
58-
uses: warrenbuckley/Setup-MSBuild@v1
5963
- name: vcpkg integration
6064
run: C:/vcpkg/vcpkg.exe integrate install
6165
- name: Build

0 commit comments

Comments
 (0)