Skip to content

Commit 41ac611

Browse files
committed
Use CI local vcpkg copy
Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent 24869e7 commit 41ac611

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/windows.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
env:
3434
OPENPACE_VER: 1.1.3
3535
VCPKG_INSTALLED: ${{ github.workspace }}\vcpkg_installed
36+
VCPKG_DEFAULT_TRIPLET: ${{ matrix.platform }}-windows-static
3637
BUILD_NUMBER: ${{ github.run_number }}
3738
steps:
3839
- name: Checkout
@@ -64,14 +65,12 @@ jobs:
6465
key: vcpkg-${{ matrix.configuration }}-${{ matrix.platform }}-${{ hashFiles('.github/vcpkg.json') }}
6566
- name: Prepare vcpkg
6667
if: matrix.configuration == 'Release'
67-
uses: lukka/run-vcpkg@v11
68-
with:
69-
vcpkgJsonGlob: .github/vcpkg.json
70-
runVcpkgInstall: true
7168
env:
7269
VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
73-
VCPKG_DEFAULT_TRIPLET: ${{ matrix.platform }}-windows-static
74-
VCPKG_INSTALLED_DIR: ${{ env.VCPKG_INSTALLED }}
70+
run: |
71+
C:\vcpkg\vcpkg install `
72+
--x-manifest-root ${{ github.workspace }}/.github `
73+
--x-install-root ${env:VCPKG_INSTALLED}
7574
- name: Install WIX
7675
run: powershell -ExecutionPolicy Bypass -File .github/setup-wix.ps1
7776
- name: Restore Cache
@@ -84,6 +83,7 @@ jobs:
8483
- name: Build OpenPACE
8584
if: matrix.configuration == 'Release' && steps.cache.outputs.cache-hit != 'true'
8685
run: |
86+
dir
8787
Invoke-WebRequest "https://github.com/frankmorgner/openpace/archive/${env:OPENPACE_VER}.zip" -OutFile openpace.zip
8888
tar xf openpace.zip
8989
cd openpace-${env:OPENPACE_VER}\src

0 commit comments

Comments
 (0)