From e24b808394f933a7b82c559500a75f942e9829d6 Mon Sep 17 00:00:00 2001 From: Liam Keegan Date: Wed, 26 Jan 2022 09:37:49 +0100 Subject: [PATCH 1/2] msys ci: un-pin setup-msys2 action version --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e0ffa63ab..b73cd9ce2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: >- From f8c479bdd578bd230a855f0d05c2e76bb8dec54b Mon Sep 17 00:00:00 2001 From: Liam Keegan Date: Wed, 26 Jan 2022 09:53:08 +0100 Subject: [PATCH 2/2] msys ci: explicitly set PYTHONHOME and PYTHONPATH for c++ and interface tests (to workaround https://github.com/msys2/setup-msys2/issues/167) --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b73cd9ce2a..38b85aeef4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -934,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 @@ -952,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 @@ -970,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