Browse Source

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
hl_urbicide
Roman Chistokhodov 3 years ago committed by GitHub
parent
commit
4596f19734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      .github/workflows/.github.yml

6
.github/workflows/.github.yml

@ -14,7 +14,7 @@ jobs:
- os: ubuntu-latest - os: ubuntu-latest
cc: clang cc: clang
cxx: clang++ cxx: clang++
- os: windows-2016 - os: windows-2019
cc: cl cc: cl
cxx: cl cxx: cl
env: env:
@ -81,12 +81,12 @@ jobs:
- name: Build with msvc - name: Build with msvc
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
run: | 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 msbuild -verbosity:normal /property:Configuration=Release build/INSTALL.vcxproj
- name: Build with msvc and vgui - name: Build with msvc and vgui
if: startsWith(matrix.os, 'windows') if: startsWith(matrix.os, 'windows')
run: | 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 msbuild -verbosity:normal /property:Configuration=Release build/INSTALL.vcxproj
- name: Extract branch name - name: Extract branch name

Loading…
Cancel
Save