Skip to content

Commit 0d3ef83

Browse files
committed
ci: Use relative paths in win64-native CI job consistently
This change improves readability. Also the `Tee-Object` cmdlet is used when appropriate.
1 parent 501acee commit 0d3ef83

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 8 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
@@ -242,8 +240,7 @@ jobs:
242240
Set-Location "$env:VCPKG_INSTALLATION_ROOT"
243241
Add-Content -Path "triplets\x64-windows-static.cmake" -Value "set(VCPKG_BUILD_TYPE release)"
244242
.\vcpkg.exe --vcpkg-root "$env:VCPKG_INSTALLATION_ROOT" integrate install
245-
git rev-parse HEAD | Out-File -FilePath "$env:GITHUB_WORKSPACE\vcpkg_commit"
246-
Get-Content -Path "$env:GITHUB_WORKSPACE\vcpkg_commit"
243+
git rev-parse HEAD | Tee-Object -FilePath "$env:GITHUB_WORKSPACE\vcpkg_commit"
247244
248245
- name: vcpkg tools cache
249246
uses: actions/cache@v4

0 commit comments

Comments
 (0)