Skip to content

Commit 7f1f7a8

Browse files
stephengtuggystefanseefeld
authored andcommitted
test-windows.yml: Set VCPKG_INSTALLED_DIR env var, and use its value in --with-boost-include= faber parameters
1 parent 83d828d commit 7f1f7a8

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

‎.github/workflows/test-windows.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
X_VCPKG_ASSET_SOURCES: clear;x-azurl,file:///${{ github.workspace }}/vcpkgAssets,,readwrite
1717
VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkgBin,readwrite
1818
VCPKG_BUILD_TREES: "${{ github.workspace }}/vcpkgBuild"
19+
VCPKG_INSTALLED_DIR: "${{ github.workspace }}/vcpkgInstalled"
1920
VCPKG_INSTALL_OPTIONS: "--x-buildtrees-root=${{ github.workspace }}/vcpkgBuild"
2021
VCPKG_DEFAULT_TRIPLET: 'x64-windows'
2122
VCPKG_DEFAULT_HOST_TRIPLET: 'x64-windows'
@@ -71,12 +72,12 @@ jobs:
7172
- name: build
7273
shell: cmd
7374
run: |
74-
faber --builddir=build cxx.name=msvc --log=commands --log=output --with-boost-include="${{ github.workspace }}\\969f6665-88a2-4c98-938e-ca9259871fec\\vcpkg_installed\\x64-windows\\include" -j4
75+
faber --builddir=build cxx.name=msvc --log=commands --log=output --with-boost-include="${{ github.workspace }}/vcpkgInstalled" -j4
7576
7677
- name: test
7778
shell: cmd
7879
run: |
79-
faber --builddir=build cxx.name=msvc --with-boost-include="${{ github.workspace }}\\969f6665-88a2-4c98-938e-ca9259871fec\\vcpkg_installed\\x64-windows\\include" -j4 test.report
80+
faber --builddir=build cxx.name=msvc --with-boost-include="${{ github.workspace }}/vcpkgInstalled" -j4 test.report
8081
8182
- name: Save vcpkg cache
8283
id: cache-vcpkg-save

0 commit comments

Comments
 (0)