2 commits - .gitlab-ci.yml

[GitLab Mirror]

 .gitlab-ci.yml |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 9a05c9c3685ff90677f6adf83d2a40ea608d03fb
Merge: 95ee2708b 724ea5463
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Sun Apr 14 18:28:14 2024 +0000

    Merge branch 'ci-meson-windows' into 'master'
    
    ci: install latest Meson on windows jobs
    
    See merge request cairo/cairo!541

commit 724ea54638e26d743948bd8e6af3ef26fb613ae8
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Sun Apr 14 18:52:46 2024 +0100

    ci: install latest Meson on windows jobs
    
    Looks like fontconfig requires a newer Meson than
    what's installed in the image.

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