fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 .gitlab-ci/other.yml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e1081d4a9ec47fbd9e966aad9a326c2baa27229
Merge: e188300 037d940
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Nov 22 12:33:45 2024 +0000

    Merge branch 'windowsImages' into 'main'
    
    Update Windows image to gstreamer image from stable
    
    See merge request fontconfig/fontconfig!346

commit 037d9407776c4cd801a78b9e138a9fad9f305f72
Author: Dominik Röttsches <drott at chromium.org>
Date:   Fri Nov 22 12:29:01 2024 +0200

    Update Windows image to gstreamer image from stable
    
    Following @tpm's suggestion in [1], after updating the Mac
    image, update the Windows VM image as well.
    
    [1] https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/345#note_2668671

diff --git a/.gitlab-ci/other.yml b/.gitlab-ci/other.yml
index b3e159b..a4f77ec 100644
--- a/.gitlab-ci/other.yml
+++ b/.gitlab-ci/other.yml
@@ -1,8 +1,8 @@
 # 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
+# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-image-tags.yml#L18
 .build meson windows:
-  image: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2022-09-23.0-main"
+  image: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2024-11-12.0-main"
   stage: "test"
   tags:
     - "docker"