|
21 | 21 | # - { compiler: gcc, version: 15, build_type: Debug, cppstd: 20 } |
22 | 22 | # - { compiler: gcc, version: 15, build_type: Release, cppstd: 20 } |
23 | 23 |
|
24 | | - # - { compiler: clang, version: 11, build_type: Release, cppstd: 17 } |
| 24 | + - { compiler: clang, version: 11, build_type: Release, cppstd: 17 } |
25 | 25 | # - { compiler: clang, version: 11, build_type: Debug, cppstd: 17 } |
26 | 26 | # - { compiler: clang, version: 12, build_type: Debug, cppstd: 17 } |
27 | 27 | # - { compiler: clang, version: 13, build_type: Debug, cppstd: 17 } |
@@ -54,20 +54,15 @@ jobs: |
54 | 54 | fi |
55 | 55 | echo "CC=clang-${{ matrix.config.version }}" >> $GITHUB_ENV |
56 | 56 | echo "CXX=clang++-${{ matrix.config.version }}" >> $GITHUB_ENV |
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 | 57 | - name: Setup vcpkg |
65 | 58 | uses: lukka/run-vcpkg@v11 |
66 | 59 | with: |
67 | 60 | vcpkgJsonGlob: '**/vcpkg.json' |
68 | 61 | vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' |
69 | 62 | vcpkgGitCommitId: 120deac3062162151622ca4860575a33844ba10b |
70 | 63 | - name: Build |
| 64 | + # Note that run-vcpkg sets VCPKG_ROOT so use it to specify the toolchain |
| 65 | + # and avoid oddities with ${{ runner.workspace }} |
71 | 66 | run: | |
72 | 67 | mkdir -p build && cd build |
73 | 68 | cmake .. \ |
|
0 commit comments