Skip to content

Commit bec703e

Browse files
committed
fixups from testurin tests
1 parent 3eb1db4 commit bec703e

File tree

1 file changed

+22
-10
lines changed

1 file changed

+22
-10
lines changed

.github/workflows/pyo3-wheels.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,19 @@ jobs:
5353
and d['arch'] == 'aarch64'
5454
and d['python-version'] != '3.x'
5555
)
56+
# windows and graal don't work
57+
if not (d['platform'] == 'windows' and d['python-version'] == 'graalpy-24')
5658
]
5759
for job in matrix:
5860
match job['platform']:
5961
case 'linux':
6062
job['manylinux'] = 'auto'
61-
job['args'] = '--release --out dist -m ua-parser-py/Cargo.toml -i python --zig'
63+
job['args'] = ' --zig'
6264
case 'mussllinux':
6365
job['manylinux'] = 'musllinux_1_2'
64-
job['args'] = '--release --out dist -m ua-parser-py/Cargo.toml'
65-
case _:
66-
job['args'] = '--release --out dist -m ua-parser-py/Cargo.toml -i python'
6766
6867
job['runs'] = builder[job['platform'], job['arch']]
6968
70-
print(pprint.pprint(matrix))
7169
with open(os.environ['GITHUB_OUTPUT'], 'w') as f:
7270
f.write("matrix=")
7371
json.dump({'include': matrix}, f)
@@ -107,12 +105,12 @@ jobs:
107105
~/.cache/pip
108106
~/.cache/pip-graalpy
109107
key: ${{ runner.os }}-pip-maturin-${{ matrix.python-version }}
110-
108+
- if: (matrix.platform == 'windows' && matrix.arch == 'aarch64') || (matrix.platform == 'macos' && matrix.arch == 'x86_64')
109+
uses: actions-rust-lang/setup-rust-toolchain@v1
111110
- name: Build wheels
112111
uses: PyO3/maturin-action@v1
113112
with:
114-
target: ${{ matrix.arch }}
115-
args: ${{ matrix.args }}
113+
args: --release --out dist -m ua-parser-py/Cargo.toml --find-interpreter ${{ matrix.args }}
116114
sccache: 'true'
117115
manylinux: ${{ matrix.manylinux }}
118116
- name: Upload wheels
@@ -168,6 +166,12 @@ jobs:
168166
exclude:
169167
- platform: windows
170168
python-version: graalpy-24
169+
- platform: windows
170+
arch: aarch64
171+
python-version: pypy-3.1
172+
- platform: windows
173+
arch: aarch64
174+
python-version: pypy-3.11
171175

172176
include:
173177
- wheel: "3.x"
@@ -179,10 +183,18 @@ jobs:
179183
wheel: "graalpy-24"
180184

181185
- runner: ubuntu-latest
186+
- arch: aarch64
187+
runner: ubuntu-20.04-arm
182188
- platform: windows
183189
runner: windows-latest
190+
- platform: windows
191+
arch: aarch64
192+
runner: windows-11-arm
184193
- platform: macos
185194
runner: macos-latest
195+
- platform: macos
196+
arch: x86_64
197+
runner: macos-13
186198

187199
runs-on: ${{ matrix.runner }}
188200

@@ -211,7 +223,7 @@ jobs:
211223
- name: Update pip
212224
run: python -mpip install --upgrade pip
213225
- name: Maybe install libyaml-dev
214-
if: matrix.runs == 'ubuntu-latest'
226+
if: startsWith(matrix.runs, 'ubuntu-latest')
215227
run: |
216228
# if binary wheels are not available for the current
217229
# package install libyaml-dev so we can install pyyaml
@@ -230,7 +242,7 @@ jobs:
230242
name: Release
231243
runs-on: ubuntu-latest
232244
needs: [py-release-tests, py-release-sdist]
233-
if: ${{ github.event == 'workflow_dispatch' && inputs.release }}
245+
if: github.event == 'workflow_dispatch' && inputs.release
234246
permissions:
235247
# Use to sign the release artifacts
236248
id-token: write

0 commit comments

Comments
 (0)