Commit bcb6d63c by Liam Keegan Committed by GitHub

fix msys ci python issue (#3651)

* msys ci: un-pin setup-msys2 action version

* msys ci: explicitly set PYTHONHOME and PYTHONPATH for c++ and interface tests (to workaround https://github.com/msys2/setup-msys2/issues/167)
parent dedda228
...@@ -904,8 +904,7 @@ jobs: ...@@ -904,8 +904,7 @@ jobs:
- { sys: mingw64, env: x86_64 } - { sys: mingw64, env: x86_64 }
- { sys: mingw32, env: i686 } - { sys: mingw32, env: i686 }
steps: steps:
# Force version because of https://github.com/msys2/setup-msys2/issues/167 - uses: msys2/setup-msys2@v2
- uses: msys2/setup-msys2@v2.4.2
with: with:
msystem: ${{matrix.sys}} msystem: ${{matrix.sys}}
install: >- install: >-
...@@ -935,10 +934,10 @@ jobs: ...@@ -935,10 +934,10 @@ jobs:
run: cmake --build build --target pytest -j 2 run: cmake --build build --target pytest -j 2
- name: C++11 tests - name: C++11 tests
run: cmake --build build --target cpptest -j 2 run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build --target cpptest -j 2
- name: Interface test C++11 - name: Interface test C++11
run: cmake --build build --target test_cmake_build run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build --target test_cmake_build
- name: Clean directory - name: Clean directory
run: git clean -fdx run: git clean -fdx
...@@ -953,10 +952,10 @@ jobs: ...@@ -953,10 +952,10 @@ jobs:
run: cmake --build build2 --target pytest -j 2 run: cmake --build build2 --target pytest -j 2
- name: C++14 tests - name: C++14 tests
run: cmake --build build2 --target cpptest -j 2 run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build2 --target cpptest -j 2
- name: Interface test C++14 - name: Interface test C++14
run: cmake --build build2 --target test_cmake_build run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build2 --target test_cmake_build
- name: Clean directory - name: Clean directory
run: git clean -fdx run: git clean -fdx
...@@ -971,7 +970,7 @@ jobs: ...@@ -971,7 +970,7 @@ jobs:
run: cmake --build build3 --target pytest -j 2 run: cmake --build build3 --target pytest -j 2
- name: C++17 tests - name: C++17 tests
run: cmake --build build3 --target cpptest -j 2 run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build3 --target cpptest -j 2
- name: Interface test C++17 - name: Interface test C++17
run: cmake --build build3 --target test_cmake_build run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build3 --target test_cmake_build
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment