From eebec53cafc797df1ca2c40431b2b93f3030845f Mon Sep 17 00:00:00 2001 From: coco875 <59367621+coco875@users.noreply.github.com> Date: Wed, 6 Aug 2025 01:14:18 +0200 Subject: Update windows_build.yml --- .github/workflows/windows_build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index 11a861b..8d6ab1e 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -14,9 +14,6 @@ jobs: config: [Release, Debug] toolchain: [v143, clangcl] generate: [Visual Studio 17 2022, Ninja] - exclude: - - toolchain: clangcl - generate: Ninja steps: - uses: actions/checkout@v4 - name: Build Visual Studio @@ -30,11 +27,16 @@ jobs: with: arch: x64 # only use default toolchain for Ninja - - name: Build Ninja - if: ${{ matrix.generate == 'Ninja' }} + - name: Build Ninja msvc + if: ${{ matrix.generate == 'Ninja' && matrix.toolchain == 'v143' }} run: | cmake -S . -B "build/x64" -G "${{ matrix.generate }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }} cmake --build ./build/x64 --config ${{ matrix.config }} --parallel 10 + - name: Build Ninja clang-cl + if: ${{ matrix.generate == 'Ninja' && matrix.toolchain == 'clangcl' }} + run: | + cmake -S . -B "build/x64" -G "${{ matrix.generate }}" -T ${{ matrix.toolchain }} -A x64 -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }} -DCMAKE_CXX_COMPILER=clang-cl.exe -DCMAKE_C_COMPILER=clang-cl.exe + cmake --build ./build/x64 --config ${{ matrix.config }} --parallel 10 - name: Publish packaged artifacts if: ${{ matrix.config == 'Release' }} uses: actions/upload-artifact@v4 -- cgit v1.2.3