|
24 | 24 | matrix:
|
25 | 25 | include:
|
26 | 26 | - { name: "MSVC 14.3 - C++20", os: windows-2022, std: '20', cmake_args: -G "Visual Studio 17 2022" -A x64, github_release: true }
|
27 |
| - - { name: "GCC 13 - C++20", os: ubuntu-22.04, compiler: gcc, version: 13.1, std: '20', github_release: true, install: "ninja-build"} |
28 |
| - - { name: "Clang 16 - C++20", os: ubuntu-22.04, compiler: clang, version: 16, std: 20, install: "libxml2-utils ninja-build" } |
| 27 | + - { name: "GCC 13 - C++20", os: ubuntu-22.04, compiler: gcc, version: 13.1, std: '20', github_release: true, install: "openjdk-11-jdk ninja-build" } |
| 28 | + - { name: "Clang 16 - C++20", os: ubuntu-22.04, compiler: clang, version: 16, std: 20, install: "openjdk-11-jdk ninja-build" } |
29 | 29 |
|
30 | 30 | name: ${{ matrix.name }}
|
31 | 31 | runs-on: ${{ matrix.os }}
|
@@ -61,11 +61,13 @@ jobs:
|
61 | 61 | update-ld-library-path: true
|
62 | 62 |
|
63 | 63 | - name: Install packages
|
64 |
| - if: ${{ matrix.install }} |
65 | 64 | uses: alandefreitas/cpp-actions/package-install@v1.2.1
|
66 | 65 | id: package-install
|
67 | 66 | with:
|
68 | 67 | apt-get: ${{ matrix.install }}
|
| 68 | + vcpkg: libxml2[tools] |
| 69 | + cxx: ${{ steps.setup-cpp.outputs.cxx }} |
| 70 | + cc: ${{ steps.setup-cpp.outputs.cc }} |
69 | 71 |
|
70 | 72 | - name: CMake Workflow (C++${{ matrix.std }})
|
71 | 73 | uses: alandefreitas/cpp-actions/cmake-workflow@v1.2.1
|
|
74 | 76 | cxxstd: ${{ matrix.std }}
|
75 | 77 | cxx: ${{ steps.setup-cpp.outputs.cxx }}
|
76 | 78 | cc: ${{ steps.setup-cpp.outputs.cc }}
|
| 79 | + toolchain: ${{ steps.package-install.outputs.vcpkg-toolchain }} |
77 | 80 | generator: Ninja
|
78 | 81 | install-prefix: .local
|
79 | 82 | extra-args: ${{ format('-D LLVM_ROOT="{0}" -D Clang_ROOT="{0}" -D CMAKE_EXPORT_COMPILE_COMMANDS=ON', steps.llvm-install.outputs.llvm-dir || '/usr/local') }}
|
|
0 commit comments