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.

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

feat: Cross-compile macos arm64 wheels #1348

Closed
wants to merge 34 commits into from
Closed
Changes from 3 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5ef2032
feat: Cross-compile macos arm64 wheels
armenzg Sep 7, 2021
96ebfa9
Adjust glob matching
armenzg Sep 7, 2021
fe11655
Name the upload artifact correctly
armenzg Sep 7, 2021
8d55da4
Try again
armenzg Sep 8, 2021
7e6f7d4
Undo prettier
armenzg Sep 8, 2021
224ccd8
Undo prettier
armenzg Sep 8, 2021
b999a5c
We will run tests locally
armenzg Sep 8, 2021
f3c696d
Script to test wheel on Apple Sillicon
armenzg Sep 8, 2021
6d99aa2
Upload repaired_wheels
armenzg Sep 9, 2021
ec07426
Formatting
armenzg Sep 9, 2021
c551f2e
More formatting
armenzg Sep 9, 2021
1f379d0
Fix
armenzg Sep 9, 2021
e4d5059
Create directory
armenzg Sep 9, 2021
618496e
Use absolute path
armenzg Sep 9, 2021
2c9c31b
Try again
armenzg Sep 9, 2021
8176468
Try again
armenzg Sep 9, 2021
d780f64
Faster
armenzg Sep 9, 2021
3205851
Use CIBW_REPAIR again
armenzg Sep 9, 2021
b674800
Try with push
armenzg Sep 9, 2021
89974ac
New name
armenzg Sep 9, 2021
af32975
Verbosity
armenzg Sep 9, 2021
ad58ed7
Use armenzg action
armenzg Sep 9, 2021
87d4afc
Try main
armenzg Sep 9, 2021
eba27a5
Try build script
armenzg Sep 9, 2021
9fee307
Try again
armenzg Sep 9, 2021
9fc985b
Small change
armenzg Sep 9, 2021
8adcdcb
One more try
armenzg Sep 9, 2021
4913603
Less changes
armenzg Sep 9, 2021
de4fe1e
Only Python 3.8
armenzg Sep 9, 2021
e8ddb29
A tiny bit more
armenzg Sep 9, 2021
57383fb
New script
armenzg Sep 10, 2021
415eaee
WIP
armenzg Sep 10, 2021
50d74a3
Merge branch 'ci/build-m1-wheel' of github.com:armenzg/psycopg2 into …
armenzg Sep 10, 2021
30cbc68
Changes for Intel
armenzg Sep 10, 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
37 changes: 29 additions & 8 deletions .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Build packages
on:
- workflow_dispatch


jobs:
build-sdist:
strategy:
Expand Down Expand Up @@ -51,16 +50,15 @@ jobs:
--health-timeout 5s
--health-retries 5


Copy link
Member

Choose a reason for hiding this comment

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

You don't like two spaces? 🥺

Copy link
Author

@armenzg armenzg Sep 7, 2021

Choose a reason for hiding this comment

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

I forgot to mention. prettier change the formatting of the file. I will change it.

build-manylinux:
strategy:
fail-fast: false
matrix:
include:
- {tag: manylinux2014, arch: x86_64}
- {tag: manylinux2014, arch: i686}
- {tag: manylinux_2_24, arch: aarch64}
- {tag: manylinux_2_24, arch: ppc64le}
- { tag: manylinux2014, arch: x86_64 }
Copy link
Member

Choose a reason for hiding this comment

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

Unneeded

- { tag: manylinux2014, arch: i686 }
- { tag: manylinux_2_24, arch: aarch64 }
- { tag: manylinux_2_24, arch: ppc64le }

runs-on: ubuntu-20.04
steps:
Expand Down Expand Up @@ -107,13 +105,12 @@ jobs:
--health-timeout 5s
--health-retries 5


build-macos:
runs-on: macos-10.15
strategy:
fail-fast: false
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9']
python-version: ["3.6", "3.7", "3.8", "3.9"]
Copy link
Member

Choose a reason for hiding this comment

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

Unneeded


steps:
- name: Checkout repos
Expand All @@ -137,3 +134,27 @@ jobs:
name: packages_macos
path: |
dist/*/*${{ matrix.platform }}.whl

# This only uploads the arm64 wheels for Apple M1 silicon usage
build-macos-arm64:
runs-on: macos-10.15
strategy:
fail-fast: false
name: "build-macos (3.8-3.10 - arm64)"
steps:
- uses: actions/checkout@v2
# This builds all possible Python versions (currently, 3.8 to 3.10)
- uses: pypa/[email protected]
with:
output-dir: dist
# Read about options here https://cibuildwheel.readthedocs.io/en/stable/options
env:
CIBW_ARCHS_MACOS: arm64
# Skip testing the arm64 builds
CIBW_TEST_SKIP: "*:arm64"
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: packages_macos_arm64
path: |
dist/*macosx_11_0_arm64.whl