Skip to content

Commit e100920

Browse files
Update GH actions to fix CI builds (#1828)
* Eric's fixe from PR #1827 Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Update dawidd6/action-download-artifact to v8 Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Try updating pypa/cibuildwheel Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Update setup-python Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Try using native ARM runner Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Use ubuntu-latest and ubuntu-24.04-arm Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Set MACOSX_DEPLOYMENT_TARGET Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Use default images Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Try setting CIBW_ARCHS_LINUX to auto Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Try setting CIBW_ARCHS_LINUX explicitly Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Add back ticks Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Set images explicitly Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Try removing CIBW_ARCHS_LINUX Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Try setting CIBW_ARCHS_LINUX to native Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Remove old code Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> --------- Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com>
1 parent c2985df commit e100920

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

.github/workflows/pypi-publish.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ jobs:
1717
# happen for this actual commit (the commit that the tag points to).
1818
# It also restores the files timestamps.
1919
- name: Download wheels from commit ${{ github.sha }}
20-
uses: dawidd6/action-download-artifact@v2
20+
uses: dawidd6/action-download-artifact@v8
2121
with:
2222
workflow: python-package.yml
2323
workflow_conclusion: success
2424
commit: ${{ github.sha }}
25-
name: wheels
25+
name_is_regexp: true
26+
name: `wheel-.*`
2627
path: dist
2728

2829
- name: Download sdist from commit ${{ github.sha }}
29-
uses: dawidd6/action-download-artifact@v2
30+
uses: dawidd6/action-download-artifact@v8
3031
with:
3132
workflow: python-package.yml
3233
workflow_conclusion: success

.github/workflows/python-package.yml

+12-15
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
git
134134
- name: Set up Python ${{ matrix.python-version }}
135135
if: matrix.python-version != 'mingw64'
136-
uses: actions/setup-python@v4.3.0
136+
uses: actions/setup-python@v5.4.0
137137
with:
138138
python-version: ${{ matrix.python-version }}
139139
- name: Install coverage dependency
@@ -171,31 +171,28 @@ jobs:
171171
runs-on: ${{ matrix.os }}
172172
strategy:
173173
matrix:
174-
os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
175-
python-build: ['cp37*', 'cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*']
174+
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-latest]
175+
python-build: ['cp37', 'cp38', 'cp39', 'cp310', 'cp311', 'cp312']
176176
exclude:
177-
- { os: macos-latest, python-build: 'cp37*' }
177+
- { os: macos-latest, python-build: 'cp37' }
178178
steps:
179179
- uses: actions/checkout@v4
180180

181-
- name: Set up QEMU
182-
if: runner.os == 'Linux'
183-
uses: docker/setup-qemu-action@v3
184-
185181
- name: Build wheels (Python 3)
186-
uses: pypa/cibuildwheel@v2.16.5
182+
uses: pypa/cibuildwheel@v2.22.0
187183
with:
188184
output-dir: wheelhouse
189185
env:
190-
CIBW_BUILD: ${{ matrix.python-build }}
186+
CIBW_BUILD: ${{ matrix.python-build }}*
191187
CIBW_SKIP: '*musllinux*'
192-
CIBW_ARCHS_LINUX: x86_64 aarch64
188+
CIBW_ARCHS_LINUX: native
193189
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
194190
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
191+
MACOSX_DEPLOYMENT_TARGET: 10.14
195192

196-
- uses: actions/upload-artifact@v3
193+
- uses: actions/upload-artifact@v4
197194
with:
198-
name: wheels
195+
name: wheel-${{ matrix.os }}-${{ matrix.python-build }}
199196
path: ./wheelhouse/*.whl
200197

201198
package_sdist:
@@ -206,15 +203,15 @@ jobs:
206203
with:
207204
submodules: 'recursive'
208205

209-
- uses: actions/setup-python@v4.3.0
206+
- uses: actions/setup-python@v5.4.0
210207

211208
- name: Install pypa/build
212209
run: python -m pip install build --user
213210

214211
- name: Generate sdist
215212
run: python -m build -s .
216213

217-
- uses: actions/upload-artifact@v3
214+
- uses: actions/upload-artifact@v4
218215
with:
219216
name: sdist
220217
path: dist

0 commit comments

Comments
 (0)