From 36f5cbeb57ded6a69e816f6d13fa6b58fece10e9 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 7 Nov 2024 17:29:22 +0800 Subject: [PATCH] CI: Use Visual Studio 2019 instead of 2017 Visual Studio 2019 brings C11 support and is actually needed (or best suited at least) if we are: * Building with debugging code enabled (/Zc:preprocessor is required) * Introspection works better on Visual Studio 2019 or later, also due to the preprocessor improvements. * Pulling in bleeding edge Cairo (and possibly soon, GLib) already requires C11 support. --- .gitlab-ci.yml | 2 +- .gitlab-ci/test-msvc.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fd8acde99..01b8f88166 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -264,7 +264,7 @@ macos: paths: - "${CI_PROJECT_DIR}/_build/meson-logs" -vs2017-x64: +vs2019-x64: # TODO: Uncomment this when ready to merge. # rules: # - if: $CI_PROJECT_NAMESPACE == "GNOME" diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index f8c20a254f..9f2d4df1c4 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -1,7 +1,7 @@ @echo on :: vcvarsall.bat sets various env vars like PATH, INCLUDE, LIB, LIBPATH for the :: 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 pip3 install --upgrade --user meson~=1.2 || goto :error