CI: Add Android universal builds

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e79df29a19d206fe05f7ddde49fa7c0081dc057..dbdf73a7847a9ebafdb59888b9ceb41fe1af62c0 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,6 +145,14 @@ build cerbero fedora x86_64 local:
     refs:
       - "master@gstreamer/gst-ci"
 
+build cerbero android universal local:
+  extends: '.cerbero android universal'
+  image: "${CI_REGISTRY_IMAGE}/amd64/cerbero-fedora:latest"
+  when: 'manual'
+  except:
+    refs:
+      - "master@gstreamer/gst-ci"
+
 build cerbero cross win32 local:
   extends: '.cerbero cross win32'
   image: "${CI_REGISTRY_IMAGE}/amd64/cerbero-fedora:latest"

diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 23ec2fd1a14c7e8aaadd93739686ca508c26b701..6e97ef5f12e60b2eb01153cc996ac8c269f1689f 100644 (file)
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -384,6 +384,34 @@ build cerbero fedora x86_64:
       - $CI_PROJECT_NAME == "cerbero"
 
 
+#
+# Cerbero Android Universal build
+#
+cerbero deps android universal:
+  extends: '.cerbero deps'
+  variables:
+    CONFIG: "cross-android-universal.cbc"
+    ARCH: "android_universal"
+
+.cerbero android universal:
+  extends: '.cerbero'
+  variables:
+    CONFIG: "cross-android-universal.cbc"
+
+cerbero android universal:
+  extends: '.cerbero android universal'
+  dependencies:
+    - "cerbero deps android universal"
+  only:
+    variables:
+      - $CI_PROJECT_NAME == "cerbero"
+
+build cerbero android universal:
+  extends: '.cerbero android universal'
+  except:
+    variables:
+      - $CI_PROJECT_NAME == "cerbero"
+
 #
 # Cerbero Cross Windows builds
 #