Skip to content

Commit 361faea

Browse files
committed
Improve Windows CI: add Chocolatey bin path to GITHUB_PATH, enhance vcpkg cache handling, and update binary source configuration.
1 parent 447f32b commit 361faea

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

.github/workflows/simple_engine_ci.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ jobs:
5353
shell: pwsh
5454
run: |
5555
choco install -y ninja sccache
56+
$chocoBin = "C:\ProgramData\chocolatey\bin"
57+
if (Test-Path $chocoBin) {
58+
$chocoBin | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
59+
}
5660
"SCCACHE_DIR=$env:LOCALAPPDATA\Mozilla\sccache" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
5761
5862
- name: ccache (Linux)
@@ -287,10 +291,15 @@ jobs:
287291
shell: pwsh
288292
run: |
289293
$vcpkgRoot = Join-Path $env:RUNNER_TEMP "vcpkg"
294+
$vcpkgCache = Join-Path $env:RUNNER_TEMP "vcpkg-cache"
295+
if (-not (Test-Path $vcpkgCache)) {
296+
New-Item -Path $vcpkgCache -ItemType Directory
297+
}
290298
"VCPKG_INSTALLATION_ROOT=$vcpkgRoot" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
291299
"$vcpkgRoot" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
292300
"CMAKE_TOOLCHAIN_FILE=$vcpkgRoot\scripts\buildsystems\vcpkg.cmake" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
293-
"VCPKG_DEFAULT_BINARY_CACHE=$env:RUNNER_TEMP\vcpkg-cache" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
301+
"VCPKG_DEFAULT_BINARY_CACHE=$vcpkgCache" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
302+
"VCPKG_BINARY_SOURCES=clear;files,$vcpkgCache,readwrite" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
294303
295304
- name: Install dependencies (Windows)
296305
if: runner.os == 'Windows'

0 commit comments

Comments
 (0)