From ef4bb38ebe0ec4b752117c28a07ddeafcf388db0 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sat, 26 Oct 2024 14:10:58 +0300 Subject: [PATCH] ci/windows: Bump meson version to 1.5.2 This matches the version we use in linux [1] [1] b3a5da5b5ca Part-of: --- .gitlab-image-tags.yml | 2 +- ci/docker/windows/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml index f91a0ea5e2..1a37bdaea1 100644 --- a/.gitlab-image-tags.yml +++ b/.gitlab-image-tags.yml @@ -13,4 +13,4 @@ variables: LINT_TAG: '2024-02-20.0' - WINDOWS_TAG: '2024-10-17.0' + WINDOWS_TAG: '2024-10-26.0' diff --git a/ci/docker/windows/Dockerfile b/ci/docker/windows/Dockerfile index b78b640af0..7484d375c4 100644 --- a/ci/docker/windows/Dockerfile +++ b/ci/docker/windows/Dockerfile @@ -54,7 +54,7 @@ RUN C:\upgrade_msys2.ps1 RUN C:\msys64\msys2_shell.cmd -ucrt64 -defterm -here -no-start -use-full-path -lc 'pacman -S --noconfirm mingw-w64-ucrt-x86_64-toolchain ninja openssh' -RUN python -m pip install meson==1.1.1 python-gitlab +RUN python -m pip install meson==1.5.2 python-gitlab RUN 'git config --global user.email "cirunner@gstreamer.freedesktop.org"; git config --global user.name "GStreamer CI system"'