From 722be9add30cb6246d1da89677608d11ce84875d Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 8 May 2024 12:00:56 +0100 Subject: [PATCH] Revert "ci: Use Meson version from pacman on msys2 CI runners" This reverts commit b17bd3cae605250b76df5bc4e0f20c2ff4618f0a. It was pushed directly without review, due to unclear UI in GitLab. All changes must be made through merge requests, and subject to code review and CI. --- .gitlab-ci/test-msys2.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index c63b2a22b..aaeff165e 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -26,6 +26,8 @@ CCACHE_BASEDIR="$(pwd)" CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" export CCACHE_BASEDIR CCACHE_DIR +pip3 install --upgrade --user meson==1.0.0 + PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH" DIR="$(pwd)" export PATH CFLAGS