[glib/glib-2-64: 1/2] CI: Make sure we use meson 0.49.2 in MSYS2
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-64: 1/2] CI: Make sure we use meson 0.49.2 in MSYS2
- Date: Thu, 7 May 2020 09:48:34 +0000 (UTC)
commit 857a91833ce2eb536f5fdad9febf901341c37db9
Author: Christoph Reiter <reiter christoph gmail com>
Date: Wed May 6 21:54:35 2020 +0200
CI: Make sure we use meson 0.49.2 in MSYS2
pip in MSYS2 seems to install scripts into $USERPROFILE instead of $HOME
which means the MSYS2 meson, which is newer, wins. Make sure $USERPROFILE
is in PATH as well.
.gitlab-ci/test-msys2.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 45a46165c..9845b1ac5 100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -38,7 +38,7 @@ export CCACHE_BASEDIR CCACHE_DIR
pip3 install --upgrade --user meson==0.49.2
-PATH="$HOME/.local/bin:$PATH"
+PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
CFLAGS="-coverage -ftest-coverage -fprofile-arcs"
DIR="$(pwd)"
export PATH CFLAGS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]