From df8a27806d241a1831f66dcd9065a64d2f01f535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Chlup?= Date: Tue, 2 Jun 2026 08:45:03 +0200 Subject: [PATCH 1/2] CI: Make VsDevCmd.bat execution work independently of VS version in GH Actions --- .github/workflows/windows.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 55c325602d4..219c9f899f0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -52,7 +52,10 @@ jobs: - name: Configure CMake shell: cmd run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }} + where /R "C:\Program Files\Microsoft Visual Studio" VsDevCmd.bat > vs_setup_path + set /p SETUP_VS=< vs_setup_path + call "%SETUP_VS%" -arch=${{ matrix.arch }} + cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ^ -G "${{ matrix.generator }}" ^ -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ^ @@ -62,5 +65,7 @@ jobs: - name: Build shell: cmd run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }} + set /p SETUP_VS=< vs_setup_path + call "%SETUP_VS%" -arch=${{ matrix.arch }} + del vs_setup_path cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }} From defd16ee98fd3b67c3fb32f41d0f200cebd41929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Chlup?= Date: Tue, 2 Jun 2026 09:37:33 +0200 Subject: [PATCH 2/2] CI: Enable Windows builds again --- .github/workflows/windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 219c9f899f0..ded3b1976d3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,7 +20,6 @@ on: jobs: build: - if: false strategy: fail-fast: false matrix: