Skip to content

Commit c5f07fb

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

File tree

1 file changed

+21
-4
lines changed

1 file changed

+21
-4
lines changed

.github/workflows/pyo3-wheels.yml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ 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']:
@@ -67,7 +69,6 @@ jobs:
6769
6870
job['runs'] = builder[job['platform'], job['arch']]
6971
70-
print(pprint.pprint(matrix))
7172
with open(os.environ['GITHUB_OUTPUT'], 'w') as f:
7273
f.write("matrix=")
7374
json.dump({'include': matrix}, f)
@@ -111,7 +112,6 @@ jobs:
111112
- name: Build wheels
112113
uses: PyO3/maturin-action@v1
113114
with:
114-
target: ${{ matrix.arch }}
115115
args: ${{ matrix.args }}
116116
sccache: 'true'
117117
manylinux: ${{ matrix.manylinux }}
@@ -129,6 +129,9 @@ jobs:
129129
- uses: actions/checkout@v4
130130
with:
131131
persist-credentials: false
132+
- name: Setup rust toolchain for windows/arm or maturin fails (?)
133+
if: matrix.runner == 'windows-11-arm'
134+
uses: actions-rust-lang/setup-rust-toolchain@v1
132135
- name: Build sdist
133136
uses: PyO3/maturin-action@v1
134137
with:
@@ -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)