From 5c5a2264577be56bddbdab2f47650053ec81b274 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 26 Jan 2023 21:42:41 +0100 Subject: [PATCH 1/1] ci: use meson 1.1.1 in the 1.22 branch Windows CI We need diff_files support for Meson wraps on the Windows CI for the libpsl wrap which is only available since Meson 0.63. We leave the Fedora Meson version on 0.62 so that we still cover that too since it's our minimum requirement. Only the image prepare script is updated for now, but the image tag is not bumped on purpose, since the 1.22 branch has very low activity and building and uploading/distributing a new image is fairly expensive. For now we just update the meson version in the Windows jobs directly. Part-of: --- .gitlab-ci.yml | 3 +++ ci/docker/windows/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 790c6ae..3f3c59f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -359,6 +359,9 @@ build clang fedora x86_64: *modules_changes - changes: - subprojects/win-*/* + before_script: + # Install more recent version. We need at least 0.63 for diff_files support in wraps + - pip3 install -U meson==1.1.1 script: # Make sure powershell exits on errors # https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_preference_variables?view=powershell-6 diff --git a/ci/docker/windows/Dockerfile b/ci/docker/windows/Dockerfile index eefa8b5..f53e96e 100644 --- a/ci/docker/windows/Dockerfile +++ b/ci/docker/windows/Dockerfile @@ -50,7 +50,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.62.2 +RUN pip3 install meson==1.1.1 RUN 'git config --global user.email "cirunner@gstreamer.freedesktop.org"; git config --global user.name "GStreamer CI system"' -- 2.7.4