Skip to content

Commit 2932139

Browse files
committed
CI: move make aarch64 first class citizen
remove the exprimental actions, and make them part of the rest of building sequence so it won't be possible to release with them working.
1 parent cdd125a commit 2932139

File tree

2 files changed

+45
-67
lines changed

2 files changed

+45
-67
lines changed

.github/workflows/build-experimental.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

.github/workflows/build-push.yml

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ jobs:
120120
run: |
121121
python3 -m cibuildwheel --output-dir wheelhouse
122122
123-
- uses: actions/upload-artifact@v2
123+
- uses: actions/upload-artifact@v4
124124
with:
125+
name: wheels-${{ matrix.os }}-${{ matrix.platform }}
125126
path: ./wheelhouse/*.whl
126127

127128
build_sdist:
@@ -141,10 +142,49 @@ jobs:
141142
142143
- uses: actions/upload-artifact@v4
143144
with:
145+
name: source-dist
144146
path: dist/*.tar.gz
145147

148+
build_wheels_extra_arch:
149+
if: "(!contains(github.event.pull_request.labels.*.name, 'disable-test-build'))|| github.event_name == 'push' && endsWith(github.event.ref, 'scylla')"
150+
# The host should always be linux
151+
runs-on: ubuntu-latest
152+
name: Build extra arch ${{ matrix.archs }} wheels
153+
strategy:
154+
fail-fast: false
155+
matrix:
156+
archs: [ aarch64,] # ppc64le ]
157+
158+
steps:
159+
- uses: actions/checkout@v4
160+
161+
- name: Set up QEMU
162+
id: qemu
163+
uses: docker/setup-qemu-action@v3
164+
with:
165+
platforms: all
166+
if: runner.os == 'Linux'
167+
168+
- uses: actions/setup-python@v5
169+
name: Install Python
170+
171+
- name: Install cibuildwheel
172+
run: |
173+
python -m pip install cibuildwheel==2.16.2
174+
175+
- name: Build wheels
176+
env:
177+
CIBW_BUILD: "cp39* cp310* cp311* cp312*" # limit to specific version since it take much more time than jobs limit
178+
run: |
179+
python -m cibuildwheel --archs ${{ matrix.archs }} --output-dir wheelhouse
180+
181+
- uses: actions/upload-artifact@v4
182+
with:
183+
name: wheels-${{ matrix.archs }}
184+
path: ./wheelhouse/*.whl
185+
146186
upload_pypi:
147-
needs: [build_wheels, build_sdist]
187+
needs: [build_wheels, build_wheels_extra_arch, build_sdist]
148188
runs-on: ubuntu-latest
149189
# upload to PyPI on every tag starting with 'v'
150190
if: github.event_name == 'push' && endsWith(github.event.ref, 'scylla')
@@ -153,10 +193,10 @@ jobs:
153193
steps:
154194
- uses: actions/download-artifact@v4
155195
with:
156-
name: artifact
157196
path: dist
197+
merge-multiple: true
158198

159-
- uses: pypa/gh-action-pypi-publish@master
199+
- uses: pypa/gh-action-pypi-publish@release/v1
160200
with:
161-
user: __token__
201+
skip-existing: true
162202
password: ${{ secrets.PYPI_API_TOKEN }}

0 commit comments

Comments
 (0)