Skip to content
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

Pypy wheel macos - build on macOS 10.15 #1337

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Pypy wheel macos - build on macOS 10.15 #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
93b8dfe
build macos wheel on 10.15
Spitfire1900 Jan 4, 2025
004c0da
build wheel on pypy-wheel-macos branch
Spitfire1900 Jan 4, 2025
5fc755f
Update pyproject.toml - do not build a universal wheel
Spitfire1900 Jan 4, 2025
576e1b1
Revert "Update pyproject.toml - do not build a universal wheel"
Spitfire1900 Jan 4, 2025
dfbd63e
Update pyproject.toml - attempt to force zlib bundling
Spitfire1900 Jan 4, 2025
7f93551
attempt to force zlib bundling with LDFLAGS
Spitfire1900 Jan 4, 2025
cfd52a3
use bundled zlib
Spitfire1900 Jan 5, 2025
d3b28f6
revert pyproject.toml to master version
Spitfire1900 Jan 5, 2025
2f38d53
cibuildwheel==2.22.0
Spitfire1900 Jan 5, 2025
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
5 changes: 3 additions & 2 deletions .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- master
- pypy-wheel-macos
tags:
- 'v*'

Expand All @@ -17,7 +18,7 @@ jobs:
- name: linux
os: ubuntu-24.04
- name: macos
os: macos-13
os: macos-15

steps:
- uses: actions/checkout@v4
Expand All @@ -32,7 +33,7 @@ jobs:
platforms: all

- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.21.3
run: python -m pip install cibuildwheel==2.22.0

- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
Expand Down
15 changes: 2 additions & 13 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,6 @@ else
cd ci
fi

# Install zlib
# XXX Build libgit2 with USE_BUNDLED_ZLIB instead?
if [ -n "$ZLIB_VERSION" ]; then
FILENAME=zlib-$ZLIB_VERSION
wget https://www.zlib.net/$FILENAME.tar.gz -N
tar xf $FILENAME.tar.gz
cd $FILENAME
./configure --prefix=$PREFIX
make
make install
cd ..
fi

# Install openssl
if [ -n "$OPENSSL_VERSION" ]; then
FILENAME=openssl-$OPENSSL_VERSION
Expand Down Expand Up @@ -189,6 +176,7 @@ if [ -n "$LIBGIT2_VERSION" ]; then
-DOPENSSL_SSL_LIBRARY="../openssl-universal/$LIBSSL" \
-DOPENSSL_INCLUDE_DIR="../openssl-x86/include" \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
-DUSE_BUNDLED_ZLIB=ON \
-DUSE_SSH=$USE_SSH
else
export CFLAGS=-I$PREFIX/include
Expand All @@ -197,6 +185,7 @@ if [ -n "$LIBGIT2_VERSION" ]; then
-DBUILD_TESTS=OFF \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
-DUSE_BUNDLED_ZLIB=ON \
-DUSE_SSH=$USE_SSH
fi
cmake --build . --target install
Expand Down