3 commits - .gitlab-ci.yml

[GitLab Mirror]

 .gitlab-ci.yml |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 58578a2f486815a1bcd9ff4744a6a8c1323fbbd6
Merge: c1bc9cd32 e4add32e1
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Wed Mar 12 20:09:45 2025 +0000

    Merge branch 'ci-windows-image-to-gstreamer-1.26' into 'master'
    
    ci: update windows image
    
    See merge request cairo/cairo!615

commit e4add32e19e40f2ca5478190916c41d82e3f2d4f
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Wed Mar 12 18:19:13 2025 +0100

    ci: mark fedora image job as "placeholder job"
    
    Which will make it start faster, and 99% of the time it
    will finish in seconds.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7120b987..62d515006 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,8 @@ fedora image:
   extends:
    - '.fdo.container-build at fedora'
   stage: 'prep'
+  tags:
+    - placeholder-job
   variables:
     FDO_DISTRIBUTION_PACKAGES: >
       meson
commit 1e2e54123d7612305a82e2fd5e0cb2c72d4c0f0a
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Wed Mar 12 18:06:31 2025 +0100

    ci: update windows image

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21ea3cab5..f7120b987 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ variables:
   # TODO: should probably get its own image at some point instead of reusing the GStreamer one
   # See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-image-tags.yml for latest
   # (This one is from the lastest stable branch since it's likely to stay around unchanged for longer)
-  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2024-03-05.0-1.24"
+  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2025-03-12.0-1.26"
 
   DEFAULT_MESON_ARGS: >
     --default-library=both