Skip to content

maint: use msys2-ucrt instead of msys2-mingw64 #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oscarbenjamin wants to merge 22 commits into
base: main
Choose a base branch
from
Open

maint: use msys2-ucrt instead of msys2-mingw64 #41

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2b14fcf
maint: use msys2-ucrt instead of msys2-mingw64
oscarbenjamin Dec 21, 2022
0cb165a
maint: use mingw-ucrt toolchain
oscarbenjamin Dec 21, 2022
87192c7
maint: add verbose output to delvewheel
oscarbenjamin Dec 21, 2022
684ab32
set build explicitly
oscarbenjamin Dec 21, 2022
a36a6d5
use ucrt64
oscarbenjamin Dec 22, 2022
5869115
fix yml syntax
oscarbenjamin Dec 22, 2022
065d9b1
show PATH
oscarbenjamin Dec 22, 2022
5045fa8
set path manually
oscarbenjamin Dec 22, 2022
ca107f4
set path again
oscarbenjamin Dec 22, 2022
d0f78bd
remove --build
oscarbenjamin Dec 22, 2022
8219cec
remove slash
oscarbenjamin Dec 22, 2022
a5aa08f
don't inherit path
oscarbenjamin Dec 22, 2022
f7860e3
try using bash
oscarbenjamin Dec 22, 2022
7bdf9a7
don't use bash
oscarbenjamin Dec 22, 2022
0589345
fix path
oscarbenjamin Dec 22, 2022
b7df8b7
set MSYSTEM
oscarbenjamin Dec 22, 2022
d8fe093
add venv to PATH
oscarbenjamin Dec 22, 2022
4854337
workaround to add venv path
oscarbenjamin Dec 22, 2022
a73b911
fix slash
oscarbenjamin Dec 22, 2022
6298d16
fix PATH
oscarbenjamin Dec 22, 2022
b1376ee
add debug output
oscarbenjamin Dec 23, 2022
302d0ce
use cygpath
oscarbenjamin Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add venv to PATH
  • Loading branch information
@oscarbenjamin
oscarbenjamin committed Dec 22, 2022
commit d8fe093c18f29ca8b2a69af1f1ee7d6fabd976e1
4 changes: 4 additions & 0 deletions bin/cibw_before_build_windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ set -o errexit
# Uncomment this to run cibuildwheel locally on Windows:
# export PATH=$PATH:/c/msys64/usr/bin:/c/msys64/mingw64/bin

# msys2 will not inherit the PATH for the virtual environment in CI
export PATH=$PATH:$VIRTUAL_ENV/Scripts
echo PATH=$PATH

# VER should be set be e.g. 310 for Python 3.10
VER=`python -c 'import sys; print("%s%s" % sys.version_info[:2])'`
echo VER=${VER}
Expand Down
4 changes: 4 additions & 0 deletions bin/cibw_repair_wheel_command_windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ pushd $wheeldir
wheel pack python_flint-*
popd

# msys2 will not inherit the PATH for the virtual environment in CI
export PATH=$PATH:$VIRTUAL_ENV/Scripts
echo PATH=$PATH

# Make the wheel relocatable. This will fail with an error message about
# --no-mangle if strip has not been applied to all mingw64-created .dll and
# .pyd files that are needed for the wheel.
Expand Down