From f3a324c1a50f68605abcef4710dc8528b13fc38d Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Fri, 29 Jul 2022 20:12:46 +0300 Subject: [PATCH] ci: Update the windows image Mainly to get newer meson Part-of: --- .gitlab-ci.yml | 2 +- ci/docker/windows/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4320614e39..c712f85738 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: ### FEDORA_TAG: '2022-03-14.0' INDENT_TAG: '2022-03-07.1' - WINDOWS_TAG: "2022-05-16.1" + WINDOWS_TAG: "2022-07-29.0" GST_UPSTREAM_REPO: 'gstreamer/gstreamer' FDO_UPSTREAM_REPO: 'gstreamer/gstreamer' diff --git a/ci/docker/windows/Dockerfile b/ci/docker/windows/Dockerfile index 77ba0a1db0..8af60a303a 100644 --- a/ci/docker/windows/Dockerfile +++ b/ci/docker/windows/Dockerfile @@ -51,7 +51,7 @@ RUN Get-ChildItem C:\BuildTools RUN Get-ChildItem C:\BuildTools\VC\Tools\MSVC RUN Get-ChildItem 'C:\Program Files (x86)\Windows Kits\10\lib' -RUN pip3 install meson==0.60.3 +RUN pip3 install meson==0.62.2 RUN 'git config --global user.email "cirunner@gstreamer.freedesktop.org"; git config --global user.name "GStreamer CI system"'