luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

CI: Switch to new Windows runners

Browse Source 
gitlab will drop cmd.exe support with GitLab 13 so I took the opportunity to
add new runners with Windows 2016 and powershell as default.

These runners are tagged with win32-ps instead of win32. The old runners
will be switched off in the coming weeks.

The main difference is that all commands and env expansions use powershell
and Windows 2016 instead of 2012r2.
This commit is contained in:
Christoph Reiter 2020-04-29 08:44:43 +02:00
parent c9bf247eb9
commit c3645a84b6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitlab-ci.yml
View File

@ -272,7 +272,7 @@ msys2-mingw32:
extends: .only-default extends: .only-default
stage: build stage: build
tags: tags:
- win32 - win32-ps
variables: variables:
MSYSTEM: "MINGW32" MSYSTEM: "MINGW32"
CHERE_INVOKING: "yes" CHERE_INVOKING: "yes"
@ -282,29 +282,29 @@ msys2-mingw32:
- C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh" - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
artifacts: artifacts:
reports: reports:
junit: "_build/%CI_JOB_NAME%-report.xml" junit: "_build/${env:CI_JOB_NAME}-report.xml"
name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%" name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
when: always when: always
paths: paths:
- _build/meson-logs - _build/meson-logs
- "_build/%CI_JOB_NAME%-report.xml" - "_build/${env:CI_JOB_NAME}-report.xml"
- _coverage/ - _coverage/
vs2017-x64: vs2017-x64:
extends: .only-default extends: .only-default
stage: build stage: build
tags: tags:
- win32 - win32-ps
script: script:
- .gitlab-ci/test-msvc.bat - .gitlab-ci/test-msvc.bat
artifacts: artifacts:
reports: reports:
junit: "_build/%CI_JOB_NAME%-report.xml" junit: "_build/${env:CI_JOB_NAME}-report.xml"
name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%" name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
when: always when: always
paths: paths:
- _build/meson-logs - _build/meson-logs
- "_build/%CI_JOB_NAME%-report.xml" - "_build/${env:CI_JOB_NAME}-report.xml"
freebsd-11-x86_64: freebsd-11-x86_64:
stage: build stage: build

2
.gitlab-ci/test-msvc.bat
View File

@ -1,7 +1,7 @@
@echo on @echo on
:: vcvarsall.bat sets various env vars like PATH, INCLUDE, LIB, LIBPATH for the :: vcvarsall.bat sets various env vars like PATH, INCLUDE, LIB, LIBPATH for the
:: specified build architecture :: 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 @echo on
:: FIXME: make warnings fatal :: FIXME: make warnings fatal