Skip to content

Commit dc4eca4

Browse files
committed
Merge bitcoin/bitcoin#30242: ci: Native Windows CI job cleanup
0d3ef83 ci: Use relative paths in `win64-native` CI job consistently (Hennadii Stepanov) 501acee ci: Remove no longer needed workaround for GHA Windows images (Hennadii Stepanov) Pull request description: This PR: 1. Removes no longer needed workaround for GHA Windows images. GHA Windows images previously had multiple VC Build Tools installed, which required specifying the `VCPKG_PLATFORM_TOOLSET_VERSION` explicitly to avoid linker errors. This issue has been resolved as per actions/runner-images#9701. 2. Switches all references to temporary files to relative ones for consistency and readability. ACKs for top commit: sipsorcery: ACK 0d3ef83. maflcko: ACK 0d3ef83 Tree-SHA512: e832b87fc6dee1e9d1eb452797f16b732e776c2ecdbe3dc9e64cc48ce9b5b89c569d5b96b999423ae1261ff4bf684b7003af84d8024ef5260682f531c4e8ff5e
2 parents 7fd4905 + 0d3ef83 commit dc4eca4

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,10 @@ jobs:
153153

154154
- name: Get tool information
155155
run: |
156-
msbuild -version | Out-File -FilePath "$env:GITHUB_WORKSPACE\msbuild_version"
157-
Get-Content -Path "$env:GITHUB_WORKSPACE\msbuild_version"
158-
$env:VCToolsVersion | Out-File -FilePath "$env:GITHUB_WORKSPACE\toolset_version"
159-
Write-Host "VCToolsVersion $(Get-Content -Path "$env:GITHUB_WORKSPACE\toolset_version")"
160-
$env:CI_QT_URL | Out-File -FilePath "$env:GITHUB_WORKSPACE\qt_url"
161-
$env:CI_QT_CONF | Out-File -FilePath "$env:GITHUB_WORKSPACE\qt_conf"
156+
msbuild -version | Tee-Object -FilePath "msbuild_version"
157+
$env:VCToolsVersion | Tee-Object -FilePath "toolset_version"
158+
$env:CI_QT_URL | Out-File -FilePath "qt_url"
159+
$env:CI_QT_CONF | Out-File -FilePath "qt_conf"
162160
py -3 --version
163161
Write-Host "PowerShell version $($PSVersionTable.PSVersion.ToString())"
164162
@@ -241,10 +239,8 @@ jobs:
241239
run: |
242240
Set-Location "$env:VCPKG_INSTALLATION_ROOT"
243241
Add-Content -Path "triplets\x64-windows-static.cmake" -Value "set(VCPKG_BUILD_TYPE release)"
244-
Add-Content -Path "triplets\x64-windows-static.cmake" -Value "set(VCPKG_PLATFORM_TOOLSET_VERSION $env:VCToolsVersion)"
245242
.\vcpkg.exe --vcpkg-root "$env:VCPKG_INSTALLATION_ROOT" integrate install
246-
git rev-parse HEAD | Out-File -FilePath "$env:GITHUB_WORKSPACE\vcpkg_commit"
247-
Get-Content -Path "$env:GITHUB_WORKSPACE\vcpkg_commit"
243+
git rev-parse HEAD | Tee-Object -FilePath "$env:GITHUB_WORKSPACE\vcpkg_commit"
248244
249245
- name: vcpkg tools cache
250246
uses: actions/cache@v4

0 commit comments

Comments
 (0)