mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-06-16 20:01:37 +02:00
Merge #17793: ci: Update GitHub Actions CI vcpkg cache on MSBuild update
0b5a366bd70119b34b112825d69804057141535f ci: Update vcpkg cache on MSBuild update (Hennadii Stepanov) b6fa752bc7c68ef5b2f839b6101c86241d3af85c ci: Update Qt binaries for GitHub Actions (Hennadii Stepanov) Pull request description: On master (0cda5573405d75d695aba417e8f22f1301ded001) Visual Studio update in GitHub Actions CI virtual environment could break a build as the `vcpkg` cache is not updated accordingly (see #17788). This PR: - force vcpkg cache update on MSBuild update - is an alternative to #17789 - fixes #17788 ACKs for top commit: fanquake: ACK 0b5a366bd70119b34b112825d69804057141535f Tree-SHA512: b9e69cb5184a3bbee4c7b14ac35985145a9fd3403d0e449d79f15c18e9660cafec495d639f5f730e0c69dde5f4a3d7590b4e42d385e794cd02add1f4e3b785e7
This commit is contained in:
commit
1dbf3350c6
14
.github/workflows/ci.yml
vendored
14
.github/workflows/ci.yml
vendored
@ -7,8 +7,8 @@ jobs:
|
||||
runs-on: windows-latest
|
||||
env:
|
||||
PYTHONUTF8: 1
|
||||
QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/v1.4/Qt5.9.8_x64_static_vs2019.zip'
|
||||
QT_DOWNLOAD_HASH: 'f285cbb02bec3b3f3cc2621e3fa7d5edf0d6a66fa30c57859e583acda954ea80'
|
||||
QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/v1.6/Qt5.9.8_x64_static_vs2019.zip'
|
||||
QT_DOWNLOAD_HASH: '9a8c6eb20967873785057fdcd329a657c7f922b0af08c5fde105cc597dd37e21'
|
||||
QT_LOCAL_PATH: 'C:\Qt5.9.8_x64_static_vs2019'
|
||||
VCPKG_INSTALL_PATH: "$env:VCPKG_INSTALLATION_ROOT/installed"
|
||||
PLATFORM: x64
|
||||
@ -19,11 +19,17 @@ jobs:
|
||||
with:
|
||||
python-version: '3.7' # Needed for PEP 540
|
||||
|
||||
- name: Setup MSBuild.exe
|
||||
uses: warrenbuckley/Setup-MSBuild@v1
|
||||
|
||||
- name: Check MSBuild.exe
|
||||
run: MSBuild.exe -version | Out-File -FilePath $env:GITHUB_WORKSPACE\MSBuild_version
|
||||
|
||||
- uses: actions/cache@v1
|
||||
id: vcpkgcache
|
||||
with:
|
||||
path: C:/vcpkg/installed
|
||||
key: ${{ runner.os }}-vcpkg
|
||||
key: ${{ runner.os }}-vcpkg-${{ hashFiles('MSBuild_version') }}
|
||||
|
||||
- name: Update vcpkg and install packages
|
||||
if: steps.vcpkgcache.outputs.cache-hit != 'true'
|
||||
@ -54,8 +60,6 @@ jobs:
|
||||
}
|
||||
- name: Generate project files
|
||||
run: python build_msvc\msvc-autogen.py
|
||||
- name: Setup MSBuild.exe
|
||||
uses: warrenbuckley/Setup-MSBuild@v1
|
||||
- name: vcpkg integration
|
||||
run: C:/vcpkg/vcpkg.exe integrate install
|
||||
- name: Build
|
||||
|
Loading…
x
Reference in New Issue
Block a user