Skip to content

Commit 8c2f3f7

Browse files
committed
ci: use in-repo vcpkg path and toolchain file
1 parent 67a49a9 commit 8c2f3f7

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ jobs:
8787
uses: lukka/run-vcpkg@v11
8888
if: ${{ matrix.vcpkg_triplet }} != null
8989
with:
90-
vcpkgDirectory: ${{ github.workspace }}/../vcpkg
90+
# Place vcpkg inside the checked-out repository workspace so git operations
91+
# performed by the action operate within the repo tree.
92+
vcpkgDirectory: ${{ github.workspace }}/vcpkg
9193
vcpkgTriplet: ${{ matrix.vcpkg_triplet }}
9294
appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
9395
additionalCachedPaths: build/vcpkg_installed
@@ -100,7 +102,7 @@ jobs:
100102
run: cmake
101103
-G "${{ matrix.cmake_generator }}"
102104
${{ matrix.cmake_options }}
103-
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/../vcpkg/scripts/buildsystems/vcpkg.cmake
105+
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
104106
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/../out
105107
-DCMAKE_BUILD_TYPE=${{ env.cmake_build_type }}
106108
-DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}
@@ -123,7 +125,7 @@ jobs:
123125
run: cmake
124126
-G "${{ matrix.cmake_generator }}"
125127
${{ matrix.cmake_options }}
126-
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/../vcpkg/scripts/buildsystems/vcpkg.cmake
128+
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
127129
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/../out
128130
-DCMAKE_BUILD_TYPE=${{ env.cmake_build_type }}
129131
-DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}

0 commit comments

Comments
 (0)