Skip to content

Commit 0936cb8

Browse files
committed
Update CI workflows
1 parent dba9abc commit 0936cb8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
matrix:
1010
config: [Debug, Release]
1111

12-
runs-on: macos-11
12+
runs-on: macos-latest
1313

1414
steps:
1515
- uses: actions/checkout@v2
@@ -31,7 +31,7 @@ jobs:
3131
shell: pwsh
3232
working-directory: build/
3333
run: |
34-
$vcpkgToolchain = Join-Path $env:VCPKG_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
34+
$vcpkgToolchain = Join-Path $env:VCPKG_INSTALLATION_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
3535
$cmakeBuildType = '${{ matrix.config }}'
3636
3737
cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" ${{ github.workspace }}

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
shell: pwsh
3939
working-directory: build/
4040
run: |
41-
$vcpkgToolchain = Join-Path $env:VCPKG_ROOT '.\scripts\buildsystems\vcpkg.cmake' -Resolve
41+
$vcpkgToolchain = Join-Path $env:VCPKG_INSTALLATION_ROOT '.\scripts\buildsystems\vcpkg.cmake' -Resolve
4242
$vcpkgTriplet = '${{ steps.set-variables.outputs.vcpkg_triplet }}'
4343
$cmakeSharedLibs = $(if ('${{ matrix.libs }}' -eq 'shared') { 'ON' } else { 'OFF' })
4444
$msbuildArch = $(if ('${{ matrix.arch }}' -eq 'x64') { 'X64' } else { 'Win32' })

0 commit comments

Comments
 (0)