Skip to content

Commit bc9c353

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

File tree

1 file changed

+28
-10
lines changed

1 file changed

+28
-10
lines changed

.github/workflows/pyo3-wheels.yml

Lines changed: 28 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,12 @@ 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
8589
- uses: actions/checkout@v4
8690
with:
8791
persist-credentials: false
@@ -107,12 +111,12 @@ jobs:
107111
~/.cache/pip
108112
~/.cache/pip-graalpy
109113
key: ${{ runner.os }}-pip-maturin-${{ matrix.python-version }}
110-
114+
- if: (matrix.platform == 'windows' && matrix.arch == 'aarch64') || (matrix.platform == 'macos' && matrix.arch == 'x86_64')
115+
uses: actions-rust-lang/setup-rust-toolchain@v1
111116
- name: Build wheels
112117
uses: PyO3/maturin-action@v1
113118
with:
114-
target: ${{ matrix.arch }}
115-
args: ${{ matrix.args }}
119+
args: --release --out dist -m ua-parser-py/Cargo.toml --find-interpreter ${{ matrix.args }}
116120
sccache: 'true'
117121
manylinux: ${{ matrix.manylinux }}
118122
- name: Upload wheels
@@ -168,6 +172,12 @@ jobs:
168172
exclude:
169173
- platform: windows
170174
python-version: graalpy-24
175+
- platform: windows
176+
arch: aarch64
177+
python-version: pypy-3.1
178+
- platform: windows
179+
arch: aarch64
180+
python-version: pypy-3.11
171181

172182
include:
173183
- wheel: "3.x"
@@ -179,10 +189,18 @@ jobs:
179189
wheel: "graalpy-24"
180190

181191
- runner: ubuntu-latest
192+
- arch: aarch64
193+
runner: ubuntu-20.04-arm
182194
- platform: windows
183195
runner: windows-latest
196+
- platform: windows
197+
arch: aarch64
198+
runner: windows-11-arm
184199
- platform: macos
185200
runner: macos-latest
201+
- platform: macos
202+
arch: x86_64
203+
runner: macos-13
186204

187205
runs-on: ${{ matrix.runner }}
188206

@@ -211,7 +229,7 @@ jobs:
211229
- name: Update pip
212230
run: python -mpip install --upgrade pip
213231
- name: Maybe install libyaml-dev
214-
if: matrix.runs == 'ubuntu-latest'
232+
if: startsWith(matrix.runs, 'ubuntu-latest')
215233
run: |
216234
# if binary wheels are not available for the current
217235
# package install libyaml-dev so we can install pyyaml
@@ -230,7 +248,7 @@ jobs:
230248
name: Release
231249
runs-on: ubuntu-latest
232250
needs: [py-release-tests, py-release-sdist]
233-
if: ${{ github.event == 'workflow_dispatch' && inputs.release }}
251+
if: github.event == 'workflow_dispatch' && inputs.release
234252
permissions:
235253
# Use to sign the release artifacts
236254
id-token: write

0 commit comments

Comments
 (0)