[glib-networking/wip/nacho/gnu99: 2/2] Reenable windows ci

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 5d1d0e95c06f8c403498e9043c845be851af608d
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date:   Mon Nov 15 11:22:11 2021 +0100

    Reenable windows ci

 .gitlab-ci.yml           | 24 ++++++++++++------------
 .gitlab-ci/test-msvc.bat |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 369ffbbc..40aa4afc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,15 +63,15 @@ fedora-x86_64-scan-build:
       - _build/meson-logs/scanbuild
     when: on_failure
 
-#vs2017-x64:
-#  stage: build
-#  except:
-#    - tags
-#  tags:
-#    - win32-ps
-#  script:
-#    - .gitlab-ci/test-msvc.bat
-#  artifacts:
-#    paths:
-#      - build/test-results
-#    when: on_failure
+vs2017-x64:
+  stage: build
+  except:
+    - tags
+  tags:
+    - win32-ps
+  script:
+    - .gitlab-ci/test-msvc.bat
+  artifacts:
+    paths:
+      - build/test-results
+    when: on_failure
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index 285b5eef..0d5eee44 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -13,7 +13,7 @@ set BUILD_DIR=c:\gnet
 
 IF EXIST %BUILD_DIR% GOTO NOGVSBUILD
 
-git clone --depth 1 https://github.com/wingtk/gvsbuild.git -b wip/nacho/glib-2-67 || goto :error
+git clone --depth 1 https://github.com/wingtk/gvsbuild.git || goto :error
 
 pushd gvsbuild
 python.exe build.py --verbose --debug build -p x64 --vs-ver 15 --build-dir %BUILD_DIR% openssl glib || goto 
:error
@@ -29,7 +29,7 @@ set INCLUDE=%DEPS_DIR%\include;%DEPS_DIR%\include\glib-2.0;%INCLUDE%
 set PKG_CONFIG_PATH=%DEPS_DIR%\lib\pkgconfig
 
 :: FIXME: make warnings fatal
-pip3 install --upgrade --user meson==0.53.2  || goto :error
+pip3 install --upgrade --user meson==0.60.0  || goto :error
 meson build -Dgnutls=disabled -Dopenssl=enabled || goto :error
 ninja -C build || goto :error