diff options
| author | Adrian Johnson <ajohnson@redneon.com> | 2023-04-16 10:06:43 +0000 |
|---|---|---|
| committer | Adrian Johnson <ajohnson@redneon.com> | 2023-04-16 10:06:43 +0000 |
| commit | 10747fe8136b774b438cdffb7983a04f260127ed (patch) | |
| tree | 3a64ff6d153db39d3084475a0c87b012cd655e31 | |
| parent | ec14ec47f76b7537260034034bc44454de6e47c1 (diff) | |
| parent | 47ec81544f213af21aa7ffba3ca3203a67238de7 (diff) | |
| download | cairo-10747fe8136b774b438cdffb7983a04f260127ed.tar.gz | |
Merge branch 'ci-windows-image-update' into 'master'
ci: bump windows image to latest and add workflow rules
See merge request cairo/cairo!473
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7479889e..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' @@ -12,7 +20,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 |