-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
Attempt to use github workflow #8
Merged
Merged
Changes from 22 commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
5df0078
Attempt to use github workflow
simoncozens e276a15
Check out more
simoncozens 99cb6e7
Alter permissions
simoncozens 02b2b72
Fail quickly, fail often
simoncozens 85b6b24
Wrong multi build path
simoncozens 80bc638
Give cibuildwheel a go instead
simoncozens 319669a
Upgrade pkgconfig etc before build
simoncozens b8dbf62
Install bison and flex
simoncozens d899d5a
My tar is better than your tar
simoncozens 8f67a7f
Build all the things!
simoncozens ed9eef2
OS X additions
simoncozens 7796333
Add to path
simoncozens f976777
We will want to repair wheels but I want to check them first
simoncozens 96b87ca
Build one python for testing
simoncozens 8c1f3af
Repair definitely needed
simoncozens 83e3722
Something wrong with delocate
simoncozens 3d51f05
No, the wheel is fine, with all ttfah built in. Build some more!
simoncozens dafc05a
Looks like Python3.9 would be enough?
simoncozens 2583c20
Apparently building on OS11 may work?
simoncozens f6dcbaf
Build universal dependents
simoncozens 73a5401
Stay on 10.15 for now
simoncozens 342b132
Typo
simoncozens 8c6611d
Test again to see if we have access to the macOS 11 runner
simoncozens 66d8962
Build all the things again
simoncozens 49d13a2
Remove old env variables
simoncozens b3949c1
Remove redundant build script
simoncozens b17a2d6
Only build once on Mac
simoncozens 4372f32
Fix path on Windows
simoncozens 4c6bd2a
De-powershell
simoncozens 3cfe2b6
Try getting gnulib manually on windows
simoncozens 027dfc7
Reindent
simoncozens b2547f8
Fix temporary path
simoncozens 4d04994
Debashify
simoncozens 262fbd0
Don’t do anything on Windows because we still have Appveyor for that
simoncozens 3ead3f7
Update badges
simoncozens File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then | ||
# these cause a conflict with built webp and libtiff, | ||
# curl from brew requires zstd, use system curl | ||
brew remove --ignore-dependencies webp zstd xz libtiff curl | ||
fi | ||
|
||
if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then | ||
if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then | ||
MB_ML_VER="2010" | ||
DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT" | ||
else | ||
MB_PYTHON_OSX_VER="10.9" | ||
fi | ||
fi | ||
|
||
echo "::group::Install a virtualenv" | ||
source ci/multibuild/common_utils.sh | ||
source ci/multibuild/travis_steps.sh | ||
python3 -m pip install virtualenv | ||
before_install | ||
echo "::endgroup::" | ||
|
||
echo "::group::Build wheel" | ||
build_wheel $REPO_DIR $PLAT | ||
ls -l "${GITHUB_WORKSPACE}/${WHEEL_SDIR}/" | ||
echo "::endgroup::" | ||
|
||
if [[ $MACOSX_DEPLOYMENT_TARGET != "11.0" ]]; then | ||
echo "::group::Test wheel" | ||
install_run $PLAT | ||
echo "::endgroup::" | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
name: Wheels | ||
|
||
on: [push, pull_request] | ||
|
||
env: | ||
REPO_DIR: . | ||
BUILD_DEPENDS: "" | ||
TEST_DEPENDS: "pytest pytest-cov" | ||
WHEEL_SDIR: wheelhouse | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think these environment variables are for a multibuild setup, not for cibuildwheel, you should try see what are the equivalent ones that cibuildwheel reads |
||
|
||
jobs: | ||
build: | ||
name: Build wheel ${{ matrix.os }} | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
os: [ "macos-10.15" ] | ||
env: | ||
BUILD_COMMIT: HEAD | ||
CIBW_BEFORE_ALL_LINUX: sh ci/docker-fixes.sh | ||
CIBW_BEFORE_ALL_MACOS: sh ci/osx-fixes.sh | ||
CIBW_ARCHS_MACOS: x86_64 arm64 universal2 | ||
CIBW_SKIP: "cp38-macosx* cp37-macosx*" | ||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
submodules: recursive | ||
fetch-depth: 0 | ||
- uses: actions/setup-python@v2 | ||
with: | ||
python-version: 3.9 | ||
- name: Update path | ||
if: startsWith(matrix.os, 'macos') | ||
run: | | ||
echo "/usr/local/opt/libtool/bin" >> $GITHUB_PATH | ||
echo "/usr/local/opt/ragel/bin" >> $GITHUB_PATH | ||
echo "/usr/local/opt/bison/bin" >> $GITHUB_PATH | ||
echo "/usr/local/opt/flex/bin" >> $GITHUB_PATH | ||
echo "/usr/local/opt/automake/bin" >> $GITHUB_PATH | ||
- name: Install cibuildwheel | ||
run: python -m pip install cibuildwheel==2.0.0a2 | ||
|
||
- name: Build wheels | ||
run: python -m cibuildwheel --output-dir wheelhouse | ||
- uses: actions/upload-artifact@v2 | ||
with: | ||
name: wheels | ||
path: wheelhouse/*.whl |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
curl http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz -L -o pkg-config.tar.gz && \ | ||
mkdir pkg-config && \ | ||
tar -zxf pkg-config.tar.gz -C pkg-config --strip-components 1 && \ | ||
cd pkg-config && \ | ||
./configure --prefix=/usr/local --with-internal-glib --disable-host-tool && \ | ||
make && \ | ||
make install | ||
|
||
curl ftp://ftp.gnu.org/gnu/m4/m4-latest.tar.gz -L -o m4.tar.gz && \ | ||
mkdir m4 && \ | ||
tar -zxf m4.tar.gz -C m4 --strip-components 1 && \ | ||
cd m4 && \ | ||
./configure --prefix=/usr/local && \ | ||
make && \ | ||
make install | ||
|
||
curl -L http://install.perlbrew.pl | bash && \ | ||
. ~/perl5/perlbrew/etc/bashrc && \ | ||
echo '. /root/perl5/perlbrew/etc/bashrc' >> /etc/bashrc && \ | ||
perlbrew install perl-5.29.0 -j 4 -n && \ | ||
perlbrew switch perl-5.29.0 | ||
|
||
curl http://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.gz -L -o automake.tar.gz && \ | ||
mkdir automake && \ | ||
tar -zxf automake.tar.gz -C automake --strip-components 1 && \ | ||
cd automake && \ | ||
./configure --prefix=/usr/local && \ | ||
make && \ | ||
make install | ||
|
||
curl http://ftp.gnu.org/gnu/autoconf/autoconf-latest.tar.gz -L -o autoconf.tar.gz && \ | ||
mkdir autoconf && \ | ||
tar -zxf autoconf.tar.gz -C autoconf --strip-components 1 && \ | ||
cd autoconf && \ | ||
./configure --prefix=/usr/local && \ | ||
make && \ | ||
make install | ||
|
||
curl http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz -L -o libtool.tar.gz && \ | ||
mkdir libtool && \ | ||
tar -zxf libtool.tar.gz -C libtool --strip-components 1 && \ | ||
cd libtool && \ | ||
./configure --prefix=/usr/local && \ | ||
make && \ | ||
make install | ||
|
||
# bison | ||
curl https://ftp.gnu.org/gnu/bison/bison-3.7.6.tar.xz -L -o bison.tar.xz && \ | ||
mkdir bison && \ | ||
xz --decompress --stdout bison.tar.xz | tar xf - -C bison --strip-components 1 && \ | ||
cd bison && \ | ||
./configure --prefix=/usr/local && \ | ||
make && \ | ||
make install | ||
|
||
# flex | ||
curl https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz -L -o flex.tar.gz && \ | ||
mkdir flex && \ | ||
tar -zxf flex.tar.gz -C flex --strip-components 1 && \ | ||
cd flex && \ | ||
./configure --prefix=/usr/local && \ | ||
make && \ | ||
make install |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
brew install libtool ragel bison flex automake |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like this
build.sh
shell script is no longer used after you switched from muiltibuild to cibuildwheel