fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 .gitlab-ci/other.yml |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit e188300cff49e4cdb3ce525377536d92873b1c97
Merge: b677ebc ae32ee2
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Nov 22 10:57:16 2024 +0000

    Merge branch 'updateMacImage' into 'main'
    
    Move Mac OS image to an up-to-date Mac OS 15 Sequoia image on ARM
    
    See merge request fontconfig/fontconfig!345

commit ae32ee22466c02424f5e8b84ff394f2cc5fe0590
Author: Dominik Röttsches <drott at chromium.org>
Date:   Thu Nov 21 12:12:44 2024 +0200

    Move Mac OS image to an up-to-date Mac OS 15 Sequoia image on ARM
    
    Follow the existing strategy of borrowing a GStreamer configuration.
    Move Ninja installation to using pip.

diff --git a/.gitlab-ci/other.yml b/.gitlab-ci/other.yml
index dc53011..b3e159b 100644
--- a/.gitlab-ci/other.yml
+++ b/.gitlab-ci/other.yml
@@ -53,8 +53,11 @@ meson vs2019 x86:
 
 meson macos:
   stage: "test"
+  # See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-ci.yml
+  # As of 2024-11-21, this is a Mac OS 15 Sequia image on Apple silicon.
+  image: "registry.freedesktop.org/gstreamer/gstreamer/macos-arm64/15-sequoia:2024-10-28.0"
   tags:
-    - gst-macos-11.1
+    - gst-mac-arm
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMMIT_SHA}"
     expire_in: "5 days"
@@ -67,12 +70,8 @@ meson macos:
     - pip3 install -U meson
     # Need to install certificates for python
     - pip3 install --upgrade certifi
-    # Anther way t install certificates
-    - open /Applications/Python\ 3.8/Install\ Certificates.command
     # Get ninja
-    - curl -L -o ninja-mac.zip https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-mac.zip
-    - unzip ninja-mac.zip
-    - sudo cp ninja /usr/local/bin
+    - pip3 install --upgrade ninja
   script:
     - CERT_PATH=$(python3 -m certifi) && export SSL_CERT_FILE=${CERT_PATH} && export REQUESTS_CA_BUNDLE=${CERT_PATH} && meson setup -Diconv=enabled build
     - meson compile --verbose -C build