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)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96d632d..7c53b1b 100644 (file)
--- 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: