Skip to content

Commit d3875ca

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

File tree

1 file changed

+28
-11
lines changed

1 file changed

+28
-11
lines changed

.github/workflows/pyo3-wheels.yml

Lines changed: 28 additions & 11 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)
@@ -88,8 +86,8 @@ jobs:
8886
- uses: actions/setup-python@v5
8987
with:
9088
python-version: ${{ matrix.python-version }}
91-
9289
- uses: actions/cache@v4
90+
if: false
9391
with:
9492
path: |
9593
~/.cargo/bin/
@@ -102,17 +100,22 @@ jobs:
102100
${{ runner.os }}-cargo-
103101
104102
- uses: actions/cache@v4
103+
if: false
105104
with:
106105
path: |
107106
~/.cache/pip
108107
~/.cache/pip-graalpy
109108
key: ${{ runner.os }}-pip-maturin-${{ matrix.python-version }}
110-
109+
# windows/arm doesn't have a rust toolchain by default
110+
- if: matrix.platform == 'windows' && matrix.arch == 'aarch64'
111+
uses: actions-rust-lang/setup-rust-toolchain@v1
112+
- run: |
113+
rustc --version
114+
cargo --version
111115
- name: Build wheels
112116
uses: PyO3/maturin-action@v1
113117
with:
114-
target: ${{ matrix.arch }}
115-
args: ${{ matrix.args }}
118+
args: --release --out dist -m ua-parser-py/Cargo.toml --find-interpreter ${{ matrix.args }}
116119
sccache: 'true'
117120
manylinux: ${{ matrix.manylinux }}
118121
- name: Upload wheels
@@ -168,6 +171,12 @@ jobs:
168171
exclude:
169172
- platform: windows
170173
python-version: graalpy-24
174+
- platform: windows
175+
arch: aarch64
176+
python-version: pypy-3.1
177+
- platform: windows
178+
arch: aarch64
179+
python-version: pypy-3.11
171180

172181
include:
173182
- wheel: "3.x"
@@ -179,10 +188,18 @@ jobs:
179188
wheel: "graalpy-24"
180189

181190
- runner: ubuntu-latest
191+
- arch: aarch64
192+
runner: ubuntu-20.04-arm
182193
- platform: windows
183194
runner: windows-latest
195+
- platform: windows
196+
arch: aarch64
197+
runner: windows-11-arm
184198
- platform: macos
185199
runner: macos-latest
200+
- platform: macos
201+
arch: x86_64
202+
runner: macos-13
186203

187204
runs-on: ${{ matrix.runner }}
188205

@@ -211,7 +228,7 @@ jobs:
211228
- name: Update pip
212229
run: python -mpip install --upgrade pip
213230
- name: Maybe install libyaml-dev
214-
if: matrix.runs == 'ubuntu-latest'
231+
if: startsWith(matrix.runs, 'ubuntu-latest')
215232
run: |
216233
# if binary wheels are not available for the current
217234
# package install libyaml-dev so we can install pyyaml
@@ -230,7 +247,7 @@ jobs:
230247
name: Release
231248
runs-on: ubuntu-latest
232249
needs: [py-release-tests, py-release-sdist]
233-
if: ${{ github.event == 'workflow_dispatch' && inputs.release }}
250+
if: github.event == 'workflow_dispatch' && inputs.release
234251
permissions:
235252
# Use to sign the release artifacts
236253
id-token: write

0 commit comments

Comments
 (0)