summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2018-10-04 17:04:41 +0100
committerSimon McVittie <smcv@collabora.com>2018-10-04 18:48:14 +0100
commit6795a08d1ec59463f82f86247378b532a1d75dbd (patch)
treeea11197c202e6c73b97d7019b312c24596cc8122
parentb2fde2a03dc7991f02628e30e0e8ebe8f809f009 (diff)
downloaddbus-6795a08d1ec59463f82f86247378b532a1d75dbd.tar.gz
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> (cherry picked from commit a6d926b805a1a38567a70490b3e8d7d6c932d1f5)
-rw-r--r--.gitlab-ci.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96d632d6..7c53b1b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,36 +82,36 @@ build:cmake:
ci_buildsys: "cmake"
script: *script
-build:i686-w64-mingw32:
+build:i686-w64-mingw32-debug:
stage: build
image: "debian:stretch-slim"
variables:
ci_host: "i686-w64-mingw32"
+ ci_variant: "debug"
script: *script
-build:i686-w64-mingw32-cmake-debug:
+build:i686-w64-mingw32-cmake:
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:x86_64-w64-mingw32:
stage: build
image: "debian:stretch-slim"
variables:
ci_host: "i686-w64-mingw32"
- ci_variant: "debug"
script: *script
-build:x86_64-w64-mingw32-cmake:
+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: