From a6d926b805a1a38567a70490b3e8d7d6c932d1f5 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Thu, 4 Oct 2018 17:04:41 +0100
Subject: [PATCH] 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>
---
 .gitlab-ci.yml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96d632d6..7c53b1b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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"