[cairo-commit] 3 commits - .gitlab-ci.yml

[GitLab Mirror]

 .gitlab-ci.yml |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 10747fe8136b774b438cdffb7983a04f260127ed
Merge: ec14ec47f 47ec81544
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun Apr 16 10:06:43 2023 +0000

    Merge branch 'ci-windows-image-update' into 'master'
    
    ci: bump windows image to latest and add workflow rules
    
    See merge request cairo/cairo!473

commit 47ec81544f213af21aa7ffba3ca3203a67238de7
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Sun Apr 16 10:19:22 2023 +0100

    ci: add some more workflow rules
    
    cargo-culted from the ci-templates template.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01759778e..894650d75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,14 @@ include:
     ref: '88ed1082df2af02090916566742543f1dbaee988'
     file: '/templates/fedora.yml'
 
+# From https://gitlab.freedesktop.org/freedesktop/ci-templates/-/blob/master/src/gitlab-ci.tmpl
+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
+      when: never
+    - if: $CI_COMMIT_BRANCH
+
 variables:
   FDO_UPSTREAM_REPO: 'cairo/cairo'
   FDO_DISTRIBUTION_VERSION: '34'
commit 8322ef3733bb1b0ea45cec6d654e12ae6a6fc498
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Sun Apr 16 10:10:56 2023 +0100

    ci: bump windows image to latest

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7479889e..01759778e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,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
-  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2022-12-10.0-main"
+  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2023-04-03.0-main"
 
   DEFAULT_MESON_ARGS: >
     --default-library=both