diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-06 21:54:35 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2020-05-06 22:07:37 +0200 |
| commit | 534a92f35f238240d6e5517e678a7a31cebcad66 (patch) | |
| tree | a762f8974627bf75cd2cbe7b754032f15fec1745 | |
| parent | 3b3026b76358736548b431d4bbbc0c4b35a623fe (diff) | |
| download | glib-534a92f35f238240d6e5517e678a7a31cebcad66.tar.gz | |
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.
| -rwxr-xr-x | .gitlab-ci/test-msys2.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |