From: Matthew Waters <matthew@centricular.com>
Date: Wed, 17 Feb 2021 05:32:38 +0000 (+1100)
Subject: ci: build universal macos packages instead of x86_64 only
X-Git-Tag: 1.19.3~497^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b65eb14636ada0b340e89fadc3261be1fff078a3;p=platform%2Fupstream%2Fgstreamer.git

ci: build universal macos packages instead of x86_64 only

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/408>
---

diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 75e1bad..d70530f 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -1116,6 +1116,40 @@ build cerbero macos x86_64:
     - if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-docs|gst-omx|gst-sharp|gstreamer-vaapi|gst-integration-testsuites|gst-plugins-rs)$/'
 
 #
+# Cerbero macOS Universal build
+#
+.cerbero cross-macos universal:
+  variables:
+    ARCH: "darwin_universal"
+    CONFIG: "cross-macos-universal.cbc"
+    CERBERO_PACKAGE_ARGS: ""
+    HAVE_CCACHE: ""
+    CERBERO_HOST_DIR: "/Users/gst-ci/cerbero/"
+  tags:
+    - gst-macos-11.1
+  artifacts:
+    name: "${CI_JOB_NAME}_${CI_COMMIT_SHA}"
+    expire_in: '5 days'
+    when: 'always'
+    paths:
+      - "manifest.xml"
+      - "${CERBERO_HOME}/logs"
+      - "gstreamer-1.0-1.*.pkg"
+      - "gstreamer-1.0-devel-1.*.pkg"
+
+cerbero deps cross-macos universal:
+  extends:
+    - '.cerbero deps'
+    - '.cerbero cross-macos universal'
+
+build cerbero cross-macos universal:
+  extends:
+    - '.cerbero'
+    - '.cerbero cross-macos universal'
+  rules:
+    - if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-docs|gst-omx|gst-sharp|gstreamer-vaapi|gst-integration-testsuites|gst-plugins-rs)$/'
+
+#
 # Cerbero iOS build
 #
 .cerbero cross-ios universal: