ci: Reshuffle mingw jobs so we test different combinations

We test the combinations that we don't test on Travis-CI.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2018-10-04 17:04:41 +01:00
parent d0728fd06e
commit a6d926b805

View file

@ -82,23 +82,7 @@ build:cmake:
ci_buildsys: "cmake"
script: *script
build:i686-w64-mingw32:
stage: build
image: "debian:stretch-slim"
variables:
ci_host: "i686-w64-mingw32"
script: *script
build:i686-w64-mingw32-cmake-debug:
stage: build
image: "debian:stretch-slim"
variables:
ci_buildsys: "cmake"
ci_host: "i686-w64-mingw32"
ci_variant: "debug"
script: *script
build:x86_64-w64-mingw32-debug:
build:i686-w64-mingw32-debug:
stage: build
image: "debian:stretch-slim"
variables:
@ -106,7 +90,7 @@ build:x86_64-w64-mingw32-debug:
ci_variant: "debug"
script: *script
build:x86_64-w64-mingw32-cmake:
build:i686-w64-mingw32-cmake:
stage: build
image: "debian:stretch-slim"
variables:
@ -114,6 +98,22 @@ build:x86_64-w64-mingw32-cmake:
ci_host: "i686-w64-mingw32"
script: *script
build:x86_64-w64-mingw32:
stage: build
image: "debian:stretch-slim"
variables:
ci_host: "i686-w64-mingw32"
script: *script
build:x86_64-w64-mingw32-cmake-debug:
stage: build
image: "debian:stretch-slim"
variables:
ci_buildsys: "cmake"
ci_host: "i686-w64-mingw32"
ci_variant: "debug"
script: *script
build:jessie:
stage: build
image: "debian:jessie-slim"