aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattip <matti.picus@gmail.com>2022-04-12 01:31:04 +0300
committerEli Schwartz <eschwartz@archlinux.org>2022-04-11 19:47:19 -0400
commitdb66e1283a5bf29710a1d6fb4711337aedec949e (patch)
tree23961291cc7be064d3e5295155be178f76c54601
parentafce78da6fe506b31df6ffb95b0e147ba0da7421 (diff)
downloadmeson-db66e1283a5bf29710a1d6fb4711337aedec949e.zip
meson-db66e1283a5bf29710a1d6fb4711337aedec949e.tar.gz
meson-db66e1283a5bf29710a1d6fb4711337aedec949e.tar.bz2
msys2 makes it hard to add to the path, work around it
-rw-r--r--.github/workflows/msys2.yml12
1 files changed, 9 insertions, 3 deletions
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index ee930f6..b49cd70 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -87,16 +87,22 @@ jobs:
run: |
mkdir pypy3local
pushd pypy3local
- wget https://downloads.python.org/pypy/pypy3.8-v7.3.9-win64.zip
+ wget -nv https://downloads.python.org/pypy/pypy3.8-v7.3.9-win64.zip
unzip pypy3.8-v7.3.9-win64.zip
mv pypy3.8-v7.3.9-win64/* ./
popd
- echo $PWD\pypy3local | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- pypy3 -m ensurepip
if: ${{ matrix.MSYS2_ARCH == 'x86_64' }}
- name: Run Tests
run: |
+ if [[ "${{ matrix.MSYS2_ARCH }}" == "x86_64" ]]; then
+ # There apparently is no clean way to add to the PATH in the
+ # previous step?
+ # See for instance https://github.com/msys2/setup-msys2/issues/171
+ export PATH=$PATH:$PWD/pypy3local
+ # Make sure it is on the PATH
+ pypy3 -c "import sys; print(sys.version)"
+ fi
export BOOST_ROOT=
export PATHEXT="$PATHEXT;.py"