[wing] CI: Switch to new Windows runners



commit cc7cd1cfe135bf1faeb5fd9cedad51d5f163ecca
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Fri May 1 14:24:30 2020 +0200

    CI: Switch to new Windows runners
    
    win32-ps instead of win32.
    Uses powershell instead of cmd and Windows 2016 instead fo 2020r2

 .gitlab-ci.yml           | 4 ++--
 .gitlab-ci/test-msvc.bat | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 789bc08..cd9cc06 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,11 +13,11 @@ vs2017-x64:
   except:
     - tags
   tags:
-    - win32
+    - win32-ps
   script:
     - .gitlab-ci/test-msvc.bat
   artifacts:
-    name: "wing-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
+    name: "wing-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
     when: always
     paths:
       - _build/meson-logs
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index fbbfcd9..19b6a5b 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
 
 :: FIXME: make warnings fatal


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]