Skip to content

Commit 5cf4f66

Browse files
committed
Try #3 for vcpkg w/github actions
1 parent 7d846fe commit 5cf4f66

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,24 @@ jobs:
5454
fi
5555
echo "CC=clang-${{ matrix.config.version }}" >> $GITHUB_ENV
5656
echo "CXX=clang++-${{ matrix.config.version }}" >> $GITHUB_ENV
57-
- name: vcpkg build
58-
id: vcpkg
59-
uses: johnwason/vcpkg-action@v7
57+
# - name: vcpkg build
58+
# id: vcpkg
59+
# uses: johnwason/vcpkg-action@v7
60+
# with:
61+
# manifest-dir: ${{ github.workspace }} # Set to directory containing vcpkg.json
62+
# triplet: x64-windows-release
63+
# token: ${{ github.token }}
64+
- name: Setup vcpkg
65+
uses: lukka/run-vcpkg@v11
6066
with:
61-
manifest-dir: ${{ github.workspace }} # Set to directory containing vcpkg.json
62-
triplet: x64-windows-release
63-
token: ${{ github.token }}
67+
vcpkgJsonGlob: '**/vcpkg.json'
68+
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
69+
vcpkgGitCommitId: 120deac3062162151622ca4860575a33844ba10b
6470
- name: Build
6571
run: |
6672
mkdir -p build && cd build
6773
cmake .. \
68-
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
74+
-DCMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake \
6975
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
7076
-DCMAKE_CXX_STANDARD=${{ matrix.config.cppstd }} \
7177
-DBUILD_EXAMPLES=${{ matrix.config.examples || 'ON' }} \

0 commit comments

Comments
 (0)