[Fontconfig] fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 1661319e5e7029251223ccf7fe40dd91a8fc0385
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Fri Oct 14 17:09:24 2022 +0100

    ci: update macOS image

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f432b3..348240f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -192,7 +192,7 @@ meson vs2019 x86:
 meson macos:
   stage: 'build'
   tags:
-    - gst-macos-10.15
+    - gst-macos-11.1
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMMIT_SHA}"
     expire_in: '5 days'
commit 9279f3f90b70246b34f3c83deb9beab6fc96e6ae
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Fri Oct 14 16:33:05 2022 +0100

    ci: update windows image to a 2022-server based one
    
    The 1809 windows runners are going to be phased out soon.
    
    Rename jobs to vs2019 because that's the default on those images now.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6d4e90..6f432b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,13 +143,15 @@ meson-mingw-w64-build:
       - prefix-*
 
 # FIXME: fontconfig should probably get its own image
+# In the meantime, the latest GStreamer image tag can be found here:
+# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-image-tags.yml#L10
 .build meson windows:
-  image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v10'
+  image: 'registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2022-09-23.0-main'
   stage: 'build'
   tags:
     - 'docker'
     - 'windows'
-    - '1809'
+    - '2022'
   variables:
     # Make sure any failure in PowerShell scripts is fatal
     ErrorActionPreference: 'Stop'
@@ -177,12 +179,12 @@ meson-mingw-w64-build:
         ninja -C build &&
         ninja -C build test"
 
-meson vs2017 amd64:
+meson vs2019 amd64:
   extends: '.build meson windows'
   variables:
     ARCH: 'amd64'
 
-meson vs2017 x86:
+meson vs2019 x86:
   extends: '.build meson windows'
   variables:
     ARCH: 'x86'