Skip to content

feat: build musllinux_1_1 wheels #193

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

Merged
merged 3 commits into from
Sep 25, 2021
Merged

feat: build musllinux_1_1 wheels #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26fd312
fix(CI): build error is not reported on TravisCI
mayeut Sep 19, 2021
196e27f
fix(CI): do not run test_distribution for built wheels
mayeut Sep 19, 2021
092f2fe
feat: build musllinux_1_1 wheels
mayeut Sep 19, 2021
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
29 changes: 26 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:


build_wheels:
name: Build ${{ matrix.arch }} wheels on ${{ matrix.os }}
name: Build ${{ matrix.build }}${{ matrix.arch }} wheels on ${{ matrix.os }}
needs: [lint]
runs-on: ${{ matrix.os }}
strategy:
Expand All @@ -40,27 +40,47 @@ jobs:
include:
- os: ubuntu-20.04
arch: "x86_64"
build: ""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These lines are not necessary, but no harm either.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather keep this verbose/explicit but if you find it makes the workflow harder to read I'm fine removing those.

use_qemu: false
- os: ubuntu-20.04
arch: "i686"
build: ""
use_qemu: false
- os: ubuntu-20.04
arch: "aarch64"
build: "manylinux_"
use_qemu: true
- os: ubuntu-20.04
arch: "aarch64"
build: "musllinux_"
use_qemu: true
- os: ubuntu-20.04
arch: "ppc64le"
build: "manylinux_"
use_qemu: true
- os: ubuntu-20.04
arch: "ppc64le"
build: "musllinux_"
use_qemu: true
- os: ubuntu-20.04
arch: "s390x"
build: "manylinux_"
use_qemu: true
- os: ubuntu-20.04
arch: "s390x"
build: "musllinux_"
use_qemu: true
- os: windows-2019
arch: "AMD64"
build: ""
use_qemu: false
- os: windows-2019
arch: "x86"
build: ""
use_qemu: false
- os: macos-10.15
arch: "x86_64"
build: ""
use_qemu: false

steps:
Expand All @@ -74,10 +94,11 @@ jobs:
if: matrix.use_qemu && fromJSON(env.USE_QEMU)

- name: Build wheels
uses: pypa/cibuildwheel@v2.1.1
uses: pypa/cibuildwheel@v2.2.0a1
if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU)
env:
CIBW_ARCHS: "${{ matrix.arch }}"
CIBW_BUILD: "cp39-${{ matrix.build }}*"

- uses: actions/upload-artifact@v2
if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU)
Expand All @@ -101,9 +122,11 @@ jobs:
fetch-depth: 0 # required for versioneer to find tags

- name: Build wheels
uses: pypa/cibuildwheel@v2.0.1
uses: pypa/cibuildwheel@v2.2.0a1
env:
CIBW_ARCHS: "${{ matrix.arch }}"
CIBW_BEFORE_ALL: "pipx install -f --pip-args=\"-c {project}/constraints-ci.txt\" cmake && pipx install -f --pip-args=\"-c {project}/constraints-ci.txt\" ninja && ./scripts/manylinux-build-and-install-openssl.sh"
CIBW_BUILD: "cp39-manylinux_*"
CIBW_MANYLINUX_X86_64_IMAGE: "manylinux1"
CIBW_MANYLINUX_I686_IMAGE: "manylinux1"

Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ matrix:
- arch: s390x

install:
- python -m pip install cibuildwheel==2.1.1
- python -m pip install cibuildwheel==2.2.0a1
- python -m pip install -r requirements-deploy.txt

script:
- |
set -e
cibuildwheel --output-dir dist
ls dist
twine --version
Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ before-all = [
before-build = "pip install -r requirements-repair.txt"
repair-wheel-command = "python scripts/repair_wheel.py -w {dest_dir} {wheel}"
test-extras = "test"
test-command = "pytest {project}/tests"
test-command = "pytest --ignore={project}/tests/test_distribution.py {project}/tests"
build-verbosity = "1"

[tool.cibuildwheel.linux]
before-all = [
"pipx install -f --pip-args=\"-c {project}/constraints-ci.txt\" cmake",
"cmake --version",
"pipx install -f --pip-args=\"-c {project}/constraints-ci.txt\" ninja",
"ninja --version",
"./scripts/manylinux-build-and-install-openssl.sh",
Expand Down