Skip to content

Commit 1e32459

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

File tree

1 file changed

+29
-10
lines changed

1 file changed

+29
-10
lines changed

.github/workflows/pyo3-wheels.yml

Lines changed: 29 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)
@@ -82,6 +80,13 @@ jobs:
8280
runs-on: ${{ matrix.runs }}
8381

8482
steps:
83+
- if: matrix.platform != 'windows'
84+
run: uname -a
85+
- if: matrix.platform == 'windows'
86+
run: |
87+
[System.Runtime.InteropServices.RuntimeInformation]::OSDescription
88+
[System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture
89+
- run: rustc --version
8590
- uses: actions/checkout@v4
8691
with:
8792
persist-credentials: false
@@ -107,12 +112,12 @@ jobs:
107112
~/.cache/pip
108113
~/.cache/pip-graalpy
109114
key: ${{ runner.os }}-pip-maturin-${{ matrix.python-version }}
110-
115+
- if: (matrix.platform == 'windows' && matrix.arch == 'aarch64') || (matrix.platform == 'macos' && matrix.arch == 'x86_64')
116+
uses: actions-rust-lang/setup-rust-toolchain@v1
111117
- name: Build wheels
112118
uses: PyO3/maturin-action@v1
113119
with:
114-
target: ${{ matrix.arch }}
115-
args: ${{ matrix.args }}
120+
args: --release --out dist -m ua-parser-py/Cargo.toml --find-interpreter ${{ matrix.args }}
116121
sccache: 'true'
117122
manylinux: ${{ matrix.manylinux }}
118123
- name: Upload wheels
@@ -168,6 +173,12 @@ jobs:
168173
exclude:
169174
- platform: windows
170175
python-version: graalpy-24
176+
- platform: windows
177+
arch: aarch64
178+
python-version: pypy-3.1
179+
- platform: windows
180+
arch: aarch64
181+
python-version: pypy-3.11
171182

172183
include:
173184
- wheel: "3.x"
@@ -179,10 +190,18 @@ jobs:
179190
wheel: "graalpy-24"
180191

181192
- runner: ubuntu-latest
193+
- arch: aarch64
194+
runner: ubuntu-20.04-arm
182195
- platform: windows
183196
runner: windows-latest
197+
- platform: windows
198+
arch: aarch64
199+
runner: windows-11-arm
184200
- platform: macos
185201
runner: macos-latest
202+
- platform: macos
203+
arch: x86_64
204+
runner: macos-13
186205

187206
runs-on: ${{ matrix.runner }}
188207

@@ -211,7 +230,7 @@ jobs:
211230
- name: Update pip
212231
run: python -mpip install --upgrade pip
213232
- name: Maybe install libyaml-dev
214-
if: matrix.runs == 'ubuntu-latest'
233+
if: startsWith(matrix.runs, 'ubuntu-latest')
215234
run: |
216235
# if binary wheels are not available for the current
217236
# package install libyaml-dev so we can install pyyaml
@@ -230,7 +249,7 @@ jobs:
230249
name: Release
231250
runs-on: ubuntu-latest
232251
needs: [py-release-tests, py-release-sdist]
233-
if: ${{ github.event == 'workflow_dispatch' && inputs.release }}
252+
if: github.event == 'workflow_dispatch' && inputs.release
234253
permissions:
235254
# Use to sign the release artifacts
236255
id-token: write

0 commit comments

Comments
 (0)