From b94f5f4892e23d0e69f42e003c10d42b790a57af Mon Sep 17 00:00:00 2001
From: Luca Bacci <luca.bacci982@gmail.com>
Date: Thu, 24 Jul 2025 11:51:42 +0200
Subject: [PATCH 1/2] CI/macOS: Add separate job for Quartz tests

---
 .gitlab-ci.yml | 49 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35daa5e61..1a3e99f2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -430,15 +430,11 @@ macOS arm64:
     when: 'always'
     expire_in: "7 days"
     paths:
-      - build/meson-logs/*.txt
-      - build/meson-private/*.pc
-      - build/test/*.log
-      - build/test/pdiff/*.log
-      - build/test/output
+      - "*"
     exclude:
-      - "build/test/**/*.cs"
-      - "build/test/**/*.trace"
-  before_script:
+      - ".git*"
+      - ".git/**/*"
+  script:
     # Install the DejaVu fonts
     - curl -LO https://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-2.37.zip
     - unzip dejavu-fonts-ttf-2.37.zip
@@ -455,14 +451,47 @@ macOS arm64:
     ####- open /Applications/Python\ 3.8/Install\ Certificates.command
     # Get ninja
     - pip3 install -U ninja
-  script:
+
     # FIXME
     - export PATH=${PATH}:/Users/gst-ci/Library/Python/3.9/bin
     - CERT_PATH=$(python3 -m certifi) && export SSL_CERT_FILE=${CERT_PATH} && export REQUESTS_CA_BUNDLE=${CERT_PATH}
     # pixman region-test fails to link on macOS
     - meson setup -Dpixman:tests=disabled build
     - meson compile --verbose -C build
-    # Test cairo-quartz. Other backends should be covered by other jobs
+
+.test macos:
+  dependencies:
+    - 'macOS arm64'
+  needs:
+    - 'macOS arm64'
+  extends:
+    - 'macOS arm64'
+  tags:
+    - gst-mac-arm
+  stage: 'test'
+  artifacts:
+    when: 'always'
+    expire_in: "7 days"
+    paths:
+      - build/meson-logs/*
+      - build/test/*.log
+      - build/test/pdiff/*.log
+      - build/test/output
+    exclude:
+      - "build/test/**/*.cs"
+      - "build/test/**/*.trace"
+
+test macos quartz:
+  extends: '.test macos'
+  script:
+    # Install the DejaVu fonts
+    - curl -LO https://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-2.37.zip
+    - unzip dejavu-fonts-ttf-2.37.zip
+    - cp dejavu-fonts-ttf-2.37/ttf/*.ttf /Library/Fonts
+    # FIXME
+    - export PATH=${PATH}:/Users/gst-ci/Library/Python/3.9/bin
+    - CERT_PATH=$(python3 -m certifi) && export SSL_CERT_FILE=${CERT_PATH} && export REQUESTS_CA_BUNDLE=${CERT_PATH}
+
     - export CAIRO_TEST_IGNORE_quartz_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-quartz-argb32.txt)
     - export CAIRO_TEST_IGNORE_quartz_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-quartz-rgb24.txt)
     - export CAIRO_TEST_TARGET=quartz

From 0e17617b58019fba4fee223ae9a35605422cb703 Mon Sep 17 00:00:00 2001
From: Luca Bacci <luca.bacci982@gmail.com>
Date: Thu, 24 Jul 2025 11:56:40 +0200
Subject: [PATCH 2/2] CI/macOS: Build less

Avoid building subproject tests
---
 .gitlab-ci.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a3e99f2e..0195840e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -455,8 +455,20 @@ macOS arm64:
     # FIXME
     - export PATH=${PATH}:/Users/gst-ci/Library/Python/3.9/bin
     - CERT_PATH=$(python3 -m certifi) && export SSL_CERT_FILE=${CERT_PATH} && export REQUESTS_CA_BUNDLE=${CERT_PATH}
-    # pixman region-test fails to link on macOS
-    - meson setup -Dpixman:tests=disabled build
+
+    - |
+       meson setup build \
+        -Dfontconfig=enabled \
+        -Dfreetype=enabled \
+        -Dglib=enabled \
+        -Dzlib=enabled \
+        -Dglib:tests=false \
+        -Dglib:sysprof=disabled \
+        -Dpixman:tests=disabled \
+        -Dpixman:demos=disabled \
+        -Dfontconfig:doc=disabled \
+        -Dfontconfig:tests=disabled \
+        -Dfreetype:tests=disabled
     - meson compile --verbose -C build
 
 .test macos: