summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2024-04-14 18:52:46 +0100
committerTim-Philipp Müller <tim@centricular.com>2024-04-14 18:52:46 +0100
commit724ea54638e26d743948bd8e6af3ef26fb613ae8 (patch)
treea440a1a366ef67afb808b021954da4f06d5ee983
parent95ee2708b8e4d549e42618a34f6bb17faed96926 (diff)
ci: install latest Meson on windows jobs
Looks like fontconfig requires a newer Meson than what's installed in the image.
-rw-r--r--.gitlab-ci.yml7
1 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 596acd882..2b3a1a6ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -315,11 +315,8 @@ mingw-64 build:
-Dzlib=enabled
${EXTRA_MESON_ARGS}
before_script:
- # Make sure meson is up to date, so we don't need to rebuild the image with each release
- # FIXME: don't update meson version for now, since there seems to be a bug
- # in newer meson versions (0.63.3 at the time of writing) where it can't
- # find some hash file and then meson subprojects update fails)
- # - pip3 install -U meson
+ # Make sure meson is up to date, latest fontconfig requires a newer Meson than what's on the image
+ - pip3 install -U meson
script:
# Make sure powershell exists on errors
# https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_preference_variables?view=powershell-6