don't uninstall gmp etc on M$ (MPFR can't do install after uninstall)

I hope this doesn't affect testing.
aleaxit · Mar 7, 2024 · 2cc90e0 · 2cc90e0
1 parent 8e2b75e
commit 2cc90e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -33,12 +33,13 @@ jobs:
           CIBW_PRERELEASE_PYTHONS: True
           CIBW_SKIP: pp* *-win32
           CIBW_BEFORE_BUILD: bash scripts/before_ci_build.sh
-          CIBW_BEFORE_BUILD_WINDOWS: >
+          CIBW_BEFORE_ALL_WINDOWS: >
             pip install delvewheel &&
             msys2 -c scripts/before_ci_build_windows.sh &&
             call mingw64/dll2lib.bat 64 "D:\a\_temp\msys64\ucrt64\bin\libgmp-10.dll" gmp &&
             call mingw64/dll2lib.bat 64 "D:\a\_temp\msys64\ucrt64\bin\libmpfr-6.dll" mpfr &&
             call mingw64/dll2lib.bat 64 "D:\a\_temp\msys64\ucrt64\bin\libmpc-3.dll" mpc
+          CIBW_BEFORE_BUILD_WINDOWS: dir
           CIBW_TEST_EXTRAS: tests
           CIBW_TEST_COMMAND: >
             pytest {package}/test/ &&
@@ -47,9 +48,7 @@ jobs:
             pytest {package}/test/
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >
             cd "D:\a\_temp\msys64\ucrt64" &&
-            delvewheel repair {wheel} -w {dest_dir} --add-path bin --no-mangle-all &&
-            cd "D:\a\gmpy\gmpy" &&
-            msys2 -c scripts/repair_ci_wheel_windows.sh
+            delvewheel repair {wheel} -w {dest_dir} --add-path bin --no-mangle-all
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
             bash scripts/repair_ci_wheel.sh {dest_dir} {wheel}
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: >

diff --git a/scripts/before_ci_build_windows.sh b/scripts/before_ci_build_windows.sh
@@ -49,7 +49,8 @@ then
   cp $PREFIX/include/{gmp,mpfr,mpc}.h gmpy2/
 
   touch finish_before_ci_build
-else
+elif [ "$OSTYPE" != "msys" ]
+then
   (cd gmp-*[0-9] && make install)
   (cd mpfr-*[0-9] && make install)
   (cd mpc-*[0-9] && make install)

diff --git a/scripts/repair_ci_wheel_windows.sh b/scripts/repair_ci_wheel_windows.sh
@@ -7,6 +7,6 @@
 #rm -rf ${dest_dir}/*
 #delvewheel repair ${wheel} -w ${dest_dir} --add-path ../gmpy2.libs
 # cleanup libs from before_ci_build*.sh
-(cd gmp-*[0-9] && make uninstall)
-(cd mpfr-*[0-9] && make uninstall)
-(cd mpc-*[0-9] && make uninstall)
+#(cd gmp-*[0-9] && make uninstall)
+#(cd mpfr-*[0-9] && make uninstall)
+#(cd mpc-*[0-9] && make uninstall)