Skip to content

Commit

Permalink
Merge branch 'master' into christian/linux_aarch64
Browse files Browse the repository at this point in the history
  • Loading branch information
hauntsaninja authored Oct 20, 2024
2 parents 46c5ea5 + 4a9d489 commit 8f07ae8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ jobs:
git -C mypy checkout $(cat mypy_commit)
- name: Install cibuildwheel and pypyp
run: |
pipx install cibuildwheel==2.19.2
pipx install pypyp==1
pipx install cibuildwheel==2.21.3
pipx install pypyp==1.2.0
- id: set-matrix
run: |
MATRIX=$(
{
cibuildwheel --config-file=cibuildwheel.toml --print-build-identifiers --platform linux mypy \
| pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})' \
&& cibuildwheel --config-file=cibuildwheel.toml --print-build-identifiers --platform macos mypy \
| pyp 'json.dumps({"only": x, "os": "macos-14"})' \
| pyp 'json.dumps({"only": x, "os": "macos-latest"})' \
&& cibuildwheel --config-file=cibuildwheel.toml --print-build-identifiers --platform windows mypy \
| pyp 'json.dumps({"only": x, "os": "windows-latest"})'
} | pyp 'json.dumps(list(map(json.loads, lines)))'
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
git clone https://github.com/python/mypy.git --recurse-submodules
git -C mypy checkout $(cat mypy_commit)
- uses: pypa/cibuildwheel@v2.19.2
- uses: pypa/cibuildwheel@v2.21.3
with:
config-file: cibuildwheel.toml
package-dir: mypy
Expand Down
2 changes: 2 additions & 0 deletions cibuildwheel.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

build-frontend = "build"
linux.manylinux-x86_64-image = "manylinux_2_28"
linux.manylinux-aarch64-image = "manylinux_2_28"
linux.musllinux-x86_64-image = "musllinux_1_1" # Change to musllinux_1_2 at some point
linux.musllinux-aarch64-image = "musllinux_1_1" # Change to musllinux_1_2 at some point

# Don't build 32-bit wheels or PyPy
skip = [
Expand Down
2 changes: 1 addition & 1 deletion mypy_commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d1d3c780c7a2d30b2a038903289ea7487303a218
b0db694cc7c6c359a9ce7b036727d0a6f3336f58

0 comments on commit 8f07ae8

Please sign in to comment.