3 commits - .gitlab-ci.yml

[GitLab Mirror]

 .gitlab-ci.yml |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit a269e60858c65c8a269e8033ede17889f35ce36c
Merge: bbbc68e61 4421a209e
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Wed Mar 20 22:40:28 2024 +0000

    Merge branch 'ci-artefacts' into 'master'
    
    ci: bump windows image and keep meson logs around for msvc builds
    
    See merge request cairo/cairo!538

commit 4421a209e9194605d9832044c558b428b285e19a
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Wed Mar 20 23:03:24 2024 +0100

    ci: keep meson logs in windows builds as artefacts

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 565e500b6..596acd882 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -341,6 +341,11 @@ mingw-64 build:
         meson subprojects update --reset &&
         meson build $env:MESON_ARGS &&
         ninja -C build"
+  artifacts:
+    expire_in: "7 days"
+    when: "always"
+    paths:
+      - 'build/meson-logs/'
 
 vs2019 shared amd64:
   extends: '.build windows'
commit 205817dcbbefe0c2010bbeb0467d296ae79c9c7f
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Wed Mar 20 23:00:29 2024 +0100

    ci: update windows image

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b54eefd3..565e500b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,8 @@ 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
-  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2023-04-21.0-main"
+  # (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"
 
   DEFAULT_MESON_ARGS: >
     --default-library=both