[gobject-introspection] CI: switch to new win32 runners
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] CI: switch to new win32 runners
- Date: Sun, 3 May 2020 18:56:30 +0000 (UTC)
commit 769f886bfa3c7b21815def592eec7279bb123f23
Author: Christoph Reiter <reiter christoph gmail com>
Date: Sun May 3 20:50:08 2020 +0200
CI: switch to new win32 runners
powershell instead of cmd, win2016 instead of 2012r2
.gitlab-ci.yml | 8 ++++----
.gitlab-ci/test-msvc.bat | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16a8f3bb..0cb71530 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,7 @@ fedora-x86_64-python3.5:
msys2-mingw32-meson:
stage: build
tags:
- - win32
+ - win32-ps
variables:
MSYSTEM: "MINGW32"
CHERE_INVOKING: "yes"
@@ -88,19 +88,19 @@ msys2-mingw32-meson:
- C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-meson.sh"
artifacts:
when: on_failure
- name: "gi-_%CI_COMMIT_REF_NAME%"
+ name: "gi-_${env:CI_COMMIT_REF_NAME}"
paths:
- _build/meson-logs
vs2017-x64-meson:
stage: build
tags:
- - win32
+ - win32-ps
script:
- .gitlab-ci/test-msvc.bat
artifacts:
when: on_failure
- name: "gi-_%CI_COMMIT_REF_NAME%"
+ name: "gi-_${env:CI_COMMIT_REF_NAME}"
paths:
- _build/meson-logs
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index a2ee44b2..549d4fd1 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -1,5 +1,5 @@
@echo on
-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
py -3 -c "import urllib.request, sys; urllib.request.urlretrieve(*sys.argv[1:])"
"https://github.com/lexxmark/winflexbison/releases/download/v2.5.14/win_flex_bison-2.5.14.zip"
win_flex_bison.zip
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]