From 07e3cee77ff1f3dffd220e076e1e134452cf3409 Mon Sep 17 00:00:00 2001 From: sbstndb/sbstndbs <30315405+sbstndb@users.noreply.github.com> Date: Thu, 3 Apr 2025 10:43:19 +0200 Subject: [PATCH 1/3] Update windows.yml --- .github/workflows/windows.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 872e80034..817b359dc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,7 +19,9 @@ jobs: matrix: runs-on: [windows-latest] sys: - - {compiler: default} + - {compiler: default, os: windows-latest} + - {compiler: default, os: windows-2019} + - {compiler: clang-cl, os: windows-latest} # Enable again and fix remaining issues after refactoring #- {compiler: clang} @@ -29,11 +31,12 @@ jobs: if: matrix.sys.compiler == 'default' uses: ilammy/msvc-dev-cmd@v1 - - name: Setup clang - if: matrix.sys.compiler == 'clang' + - name: Setup clang-cl + if: matrix.sys.compiler == 'clang-cl' run: | - echo "CC=clang" >> $GITHUB_ENV - echo "CXX=clang++" >> $GITHUB_ENV + echo "CC=clang-cl" >> $GITHUB_ENV + echo "CXX=clang-cl" >> $GITHUB_ENV + echo "clang-cl --version" - name: Checkout code uses: actions/checkout@v3 From 12527bdf935eb883096ac74ec632740bb346ca5a Mon Sep 17 00:00:00 2001 From: sbstndb/sbstndbs <30315405+sbstndb@users.noreply.github.com> Date: Thu, 3 Apr 2025 11:11:42 +0200 Subject: [PATCH 2/3] Update windows.yml --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 817b359dc..98f09a4fe 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,9 +19,9 @@ jobs: matrix: runs-on: [windows-latest] sys: - - {compiler: default, os: windows-latest} + - {compiler: default, os: windows-latest} - {compiler: default, os: windows-2019} - - {compiler: clang-cl, os: windows-latest} + - {compiler: clang-cl, os: windows-latest} # Enable again and fix remaining issues after refactoring #- {compiler: clang} From 88b5b6fbe73b6de486bc2cb5fadb34b1c5871d8e Mon Sep 17 00:00:00 2001 From: sbstndb/sbstndbs <30315405+sbstndb@users.noreply.github.com> Date: Thu, 3 Apr 2025 14:23:10 +0200 Subject: [PATCH 3/3] Update windows.yml Try to compile with c++20 to avoid one error in the CI. --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 98f09a4fe..97c18bcb8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -52,7 +52,7 @@ jobs: ninja - name: Configure using CMake - run: cmake -Bbuild -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DBUILD_TESTS=ON -G Ninja + run: cmake -Bbuild -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_FLAGS=/std:c++20 -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DBUILD_TESTS=ON -G Ninja - name: Install working-directory: build