Skip to content

Commit 7d846fe

Browse files
committed
Try #2 for vcpkg w/github actions
1 parent f9e61b6 commit 7d846fe

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/ci.yml

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

0 commit comments

Comments
 (0)