From b3508123e27f395e9d4de5c1027a587671d02619 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Wed, 27 Jun 2018 09:14:38 -0400
Subject: [PATCH] ci: factor out cross compilation jobs definitions

---
 .gitlab-ci.yml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b2134ee2..2454479c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,33 +31,29 @@ fedora-x86_64:
       - "_build/meson-logs"
       - "_coverage"
 
-cross-android_api21_arm64:
+.cross-template: &cross-template
   stage: build
   except:
     - tags
-  script:
-    # FIXME: add --werror
-    - meson --cross-file=/opt/cross_file_android_api21_arm64.txt -Diconv=gnu -Dinternal_pcre=true --buildtype debug _build
-    - ninja -C _build
   artifacts:
     name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
     paths:
       - "_build/meson-logs"
 
+cross-android_api21_arm64:
+  <<: *cross-template
+  script:
+    # FIXME: add --werror
+    - meson --cross-file=/opt/cross_file_android_arm64_21.txt -Diconv=gnu -Dinternal_pcre=true --buildtype debug _build
+    - ninja -C _build
+
 cross-mingw64:
-  stage: build
-  except:
-    - tags
+  <<: *cross-template
   script:
     # FIXME: Add --werror
     - meson --cross-file=/opt/cross_file_mingw64.txt --buildtype debug _build
     - ninja -C _build
-  artifacts:
-    name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
-    when: always
-    paths:
-      - "_build/meson-logs"
 
 msys2-mingw32:
   stage: build