From 4596f19734fe5cb23ff24808abcd7e1dd579e56c Mon Sep 17 00:00:00 2001 From: Roman Chistokhodov Date: Thu, 2 Dec 2021 02:19:12 +0300 Subject: [PATCH] Update windows and visual studio version (#214) * Update windows and visual studio versions in CI * Try without XP toolchain * Revert "Try without XP toolchain" This reverts commit d80321a81880c4200d2e4e14f7bbed3bf9346ab0. * Force 32-bit --- .github/workflows/.github.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/.github.yml b/.github/workflows/.github.yml index 34c449d1..796110fa 100644 --- a/.github/workflows/.github.yml +++ b/.github/workflows/.github.yml @@ -14,7 +14,7 @@ jobs: - os: ubuntu-latest cc: clang cxx: clang++ - - os: windows-2016 + - os: windows-2019 cc: cl cxx: cl env: @@ -81,12 +81,12 @@ jobs: - name: Build with msvc if: startsWith(matrix.os, 'windows') run: | - cmake -G "Visual Studio 15 2017" -B build -DGOLDSOURCE_SUPPORT=ON -DCMAKE_INSTALL_PREFIX="dist" + cmake -G "Visual Studio 16 2019" -A Win32 -B build -DGOLDSOURCE_SUPPORT=ON -DCMAKE_INSTALL_PREFIX="dist" msbuild -verbosity:normal /property:Configuration=Release build/INSTALL.vcxproj - name: Build with msvc and vgui if: startsWith(matrix.os, 'windows') run: | - cmake -G "Visual Studio 15 2017" -B build -DGOLDSOURCE_SUPPORT=ON -DUSE_VGUI=ON -DCMAKE_INSTALL_PREFIX="dist-vgui" + cmake -G "Visual Studio 16 2019" -A Win32 -B build -DGOLDSOURCE_SUPPORT=ON -DUSE_VGUI=ON -DCMAKE_INSTALL_PREFIX="dist-vgui" msbuild -verbosity:normal /property:Configuration=Release build/INSTALL.vcxproj - name: Extract branch name