summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2020-05-01 13:29:38 +0200
committerIgnacio Casal Quinteiro <nacho.resa@gmail.com>2020-05-05 14:08:58 +0000
commit7d6428e21a0b874817dcffc7a239c9a1e67a79d8 (patch)
tree7f03c655be0beadd93cd5fb98a1b96cec62f40e2
parentebac9da6596c87eb53f803829865d7d5b4c5d3c7 (diff)
downloadglib-networking-7d6428e21a0b874817dcffc7a239c9a1e67a79d8.tar.gz
CI: Switch to new Windows runners
win32-ps instead of win32. Uses powershell instead of cmd and Windows 2016 instead fo 2020r2
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--.gitlab-ci/test-msvc.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bf1275..6fd55d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ vs2017-x64:
except:
- tags
tags:
- - win32
+ - win32-ps
script:
- .gitlab-ci/test-msvc.bat
artifacts:
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index f47a755..0a6a87a 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\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64
@echo on
set BUILD_DIR=c:\gnet