From ed8c74461f3cfb6efdf12251357c242879b99f35 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 3 Jul 2018 16:00:54 -0400 Subject: [PATCH] ci: Install meson 0.47.0 on Windows envs --- .gitlab-ci/test-msvc.bat | 1 + .gitlab-ci/test-msys2.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index a62882de0..9b674f76e 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -5,6 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary @echo on :: FIXME: make warnings fatal +pip3 install --upgrade --user meson==0.47.0 || goto :error meson _build || goto :error ninja -C _build || goto :error diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 20c79e763..498cc27a6 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -26,7 +26,7 @@ pacman --noconfirm -S --needed \ mkdir -p _ccache export CCACHE_BASEDIR="$(pwd)" export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" -pip3 install --upgrade --user meson +pip3 install --upgrade --user meson==0.47.0 export PATH="$HOME/.local/bin:$PATH" export CFLAGS="-coverage -ftest-coverage -fprofile-arcs"