mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
CI: Switch to new Windows runners
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:
parent
c9bf247eb9
commit
c3645a84b6
@ -272,7 +272,7 @@ msys2-mingw32:
|
||||
extends: .only-default
|
||||
stage: build
|
||||
tags:
|
||||
- win32
|
||||
- win32-ps
|
||||
variables:
|
||||
MSYSTEM: "MINGW32"
|
||||
CHERE_INVOKING: "yes"
|
||||
@ -282,29 +282,29 @@ msys2-mingw32:
|
||||
- C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
|
||||
artifacts:
|
||||
reports:
|
||||
junit: "_build/%CI_JOB_NAME%-report.xml"
|
||||
name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
|
||||
junit: "_build/${env:CI_JOB_NAME}-report.xml"
|
||||
name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
|
||||
when: always
|
||||
paths:
|
||||
- _build/meson-logs
|
||||
- "_build/%CI_JOB_NAME%-report.xml"
|
||||
- "_build/${env:CI_JOB_NAME}-report.xml"
|
||||
- _coverage/
|
||||
|
||||
vs2017-x64:
|
||||
extends: .only-default
|
||||
stage: build
|
||||
tags:
|
||||
- win32
|
||||
- win32-ps
|
||||
script:
|
||||
- .gitlab-ci/test-msvc.bat
|
||||
artifacts:
|
||||
reports:
|
||||
junit: "_build/%CI_JOB_NAME%-report.xml"
|
||||
name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
|
||||
junit: "_build/${env:CI_JOB_NAME}-report.xml"
|
||||
name: "glib-${env:CI_JOB_NAME}-${env:CI_COMMIT_REF_NAME}"
|
||||
when: always
|
||||
paths:
|
||||
- _build/meson-logs
|
||||
- "_build/%CI_JOB_NAME%-report.xml"
|
||||
- "_build/${env:CI_JOB_NAME}-report.xml"
|
||||
|
||||
freebsd-11-x86_64:
|
||||
stage: build
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user