Skip to content

Commit

Permalink
fix msys ci python issue (#3651)
Browse files Browse the repository at this point in the history
* msys ci: un-pin setup-msys2 action version

* msys ci: explicitly set PYTHONHOME and PYTHONPATH for c++ and interface tests (to workaround msys2/setup-msys2#167)
  • Loading branch information
lkeegan authored Jan 26, 2022
1 parent dedda22 commit bcb6d63
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -904,8 +904,7 @@ jobs:
- { sys: mingw64, env: x86_64 }
- { sys: mingw32, env: i686 }
steps:
# Force version because of https://github.com/msys2/setup-msys2/issues/167
- uses: msys2/setup-msys2@v2.4.2
- uses: msys2/setup-msys2@v2
with:
msystem: ${{matrix.sys}}
install: >-
Expand Down Expand Up @@ -935,10 +934,10 @@ jobs:
run: cmake --build build --target pytest -j 2

- 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
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
run: git clean -fdx
Expand All @@ -953,10 +952,10 @@ jobs:
run: cmake --build build2 --target pytest -j 2

- 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
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
run: git clean -fdx
Expand All @@ -971,7 +970,7 @@ jobs:
run: cmake --build build3 --target pytest -j 2

- 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
run: cmake --build build3 --target test_cmake_build
run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build3 --target test_cmake_build

0 comments on commit bcb6d63

Please sign in to comment.