Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ci-vs2019' into 'main'

Browse Source 
CI: Use Visual Studio 2019 instead of 2017

See merge request GNOME/gtk!7904
This commit is contained in:
Matthias Clasen
2024-11-07 11:09:59 +00:00
parent 4a0323d46d 36f5cbeb57
commit 0878727ce4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -264,7 +264,7 @@ macos:
paths: paths:
- "${CI_PROJECT_DIR}/_build/meson-logs" - "${CI_PROJECT_DIR}/_build/meson-logs"
vs2017-x64: vs2019-x64:
# TODO: Uncomment this when ready to merge. # TODO: Uncomment this when ready to merge.
# rules: # rules:
# - if: $CI_PROJECT_NAMESPACE == "GNOME" # - if: $CI_PROJECT_NAMESPACE == "GNOME"

2
.gitlab-ci/test-msvc.bat
View File

@@ -1,7 +1,7 @@
@echo on @echo on
:: vcvarsall.bat sets various env vars like PATH, INCLUDE, LIB, LIBPATH for the :: vcvarsall.bat sets various env vars like PATH, INCLUDE, LIB, LIBPATH for the
:: specified build architecture :: specified build architecture
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64
@echo on @echo on
pip3 install --upgrade --user meson~=1.2 || goto :error pip3 install --upgrade --user meson~=1.2 || goto :error