Skip to content

Commit 456661f

Browse files
committed
Merge branch 'py_dist_update' into 'develop'
Python wheels: update workflow See merge request mhm/mhm!180
2 parents afa78a8 + 2a61c63 commit 456661f

File tree

3 files changed

+471
-16
lines changed

3 files changed

+471
-16
lines changed

.github/workflows/main.yml

+15-11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
jobs:
1616
build_sdist:
1717
name: sdist
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-24.04
1919
steps:
2020
- uses: actions/checkout@v4
2121
with:
@@ -30,11 +30,12 @@ jobs:
3030
run: |
3131
python -m pip install --upgrade pip
3232
pip install build
33-
python -m build --sdist
33+
python -m build --sdist --outdir dist-sdist .
3434
35-
- uses: actions/upload-artifact@v3
35+
- uses: actions/upload-artifact@v4
3636
with:
37-
path: dist/*.tar.gz
37+
name: dist-sdist
38+
path: dist-sdist/*.tar.gz
3839

3940
build_wheels:
4041
name: wheels for ${{ matrix.cfg.os }} / ${{ matrix.cfg.arch }}
@@ -43,8 +44,9 @@ jobs:
4344
fail-fast: false
4445
matrix:
4546
cfg:
46-
- { os: ubuntu-latest, arch: x86_64 }
47+
- { os: ubuntu-24.04, arch: x86_64 }
4748
- { os: macos-13, arch: x86_64 }
49+
- { os: macos-14, arch: arm64 }
4850

4951
steps:
5052
- uses: actions/checkout@v4
@@ -56,20 +58,22 @@ jobs:
5658
env:
5759
CIBW_ARCHS: ${{ matrix.cfg.arch }}
5860
with:
59-
output-dir: dist
61+
output-dir: dist-wheel-${{ matrix.cfg.os }}-${{ matrix.cfg.arch }}
6062

61-
- uses: actions/upload-artifact@v3
63+
- uses: actions/upload-artifact@v4
6264
with:
63-
path: ./dist/*.whl
65+
name: dist-wheel-${{ matrix.cfg.os }}-${{ matrix.cfg.arch }}
66+
path: ./dist-wheel-${{ matrix.cfg.os }}-${{ matrix.cfg.arch }}/*.whl
6467

6568
upload_to_pypi:
6669
needs: [build_wheels, build_sdist]
67-
runs-on: ubuntu-latest
70+
runs-on: ubuntu-24.04
6871

6972
steps:
70-
- uses: actions/download-artifact@v3
73+
- uses: actions/download-artifact@v4
7174
with:
72-
name: artifact
75+
pattern: dist-*
76+
merge-multiple: true
7377
path: dist
7478

7579
- name: Publish to Test PyPI

0 commit comments

Comments
 (0)