From e7259c52ba25580ef6aea1d84d7dff1f7b80b42e Mon Sep 17 00:00:00 2001
From: Christoph Reiter <creiter@src.gnome.org>
Date: Thu, 24 May 2018 19:18:25 +0200
Subject: [PATCH] ci: Add a VS2017 job

Thanks to Xavier Claessens for figuring out what is needed.
---
 .gitlab-ci.yml           | 11 +++++++++++
 .gitlab-ci/test-msvc.bat | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 .gitlab-ci/test-msvc.bat

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6947da2d9..ae96804db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,17 @@ msys2-mingw32:
     paths:
       - _coverage/
 
+vs2017-x64:
+  stage: build
+  tags:
+    - win32
+  script:
+    - .gitlab-ci/test-msvc.bat
+  artifacts:
+    when: always
+    paths:
+      - _build/meson-logs
+
 coverage:
   stage: coverage
   artifacts:
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
new file mode 100644
index 000000000..098419d88
--- /dev/null
+++ b/.gitlab-ci/test-msvc.bat
@@ -0,0 +1,17 @@
+@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\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+@echo on
+
+:: FIXME: make warnings fatal
+meson _build || goto :error
+ninja -C _build || goto :error
+
+meson test -C _build --timeout-multiplier 4 || goto :error
+
+:: FIXME: can we get code coverage support?
+
+goto :EOF
+:error
+exit /b 1