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

[GitLab Mirror]

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

New commits:
commit afba396847783d3a822ade983ed3a1bbf86571ac
Merge: f48210664 0532f29a6
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Fri Jul 22 14:37:32 2022 +0000

    Merge branch 'ci-update-windows-image' into 'master'
    
    ci: update windows image and use new 2022 runner and vs2019
    
    See merge request cairo/cairo!347

commit 0532f29a6d31d37ca72a3b2ccb8c658e115152f8
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Mon Jul 18 11:31:42 2022 +0200

    ci: update windows image and use new 2022 runner and vs2019
    
    Old 1809 runner is going to go away at some point.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fa840856..c48fd43d4 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/container_registry/18035 for latest
-  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2021-10-04.1-main"
+  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2022-05-16.1-main"
 
   DEFAULT_MESON_ARGS: >
     --default-library=both
@@ -276,7 +276,7 @@ meson mingw-64 build:
   tags:
     - 'docker'
     - 'windows'
-    - '1809'
+    - '2022'
   timeout: '30min'
   variables:
     MESON_ARGS: >
@@ -309,12 +309,12 @@ meson mingw-64 build:
         meson build $env:MESON_ARGS &&
         ninja -C build"
 
-meson vs2017 amd64:
+meson vs2019 amd64:
   extends: '.build meson windows'
   variables:
     ARCH: 'amd64'
 
-meson vs2017 x86:
+meson vs2019 x86:
   extends: '.build meson windows'
   variables:
     ARCH: 'x86'