Skip to content

Commit 625b48a

Browse files
ionelmcionelmc
committed
Use an artifact variable instead.
1 parent 0b9169e commit 625b48a

File tree

2 files changed

+38
-2
lines changed

2 files changed

+38
-2
lines changed

‎.github/workflows/github-actions.yml

+36-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ jobs:
104104
tox_env: 'py38-cython-nocov'
105105
cibw_arch: 'x86_64'
106106
cibw_build: 'cp38-*manylinux*'
107+
artifact: 'ubuntu-x86_64-manylinux'
107108
os: 'ubuntu-latest'
108109
- name: 'py38-cython-nocov (ubuntu/x86_64/musllinux)'
109110
python: '3.8'
@@ -112,6 +113,7 @@ jobs:
112113
tox_env: 'py38-cython-nocov'
113114
cibw_arch: 'x86_64'
114115
cibw_build: 'cp38-*musllinux*'
116+
artifact: 'ubuntu-x86_64-musllinux'
115117
os: 'ubuntu-latest'
116118
- name: 'py38-cython-nocov (ubuntu/aarch64/manylinux)'
117119
python: '3.8'
@@ -120,6 +122,7 @@ jobs:
120122
tox_env: 'py38-cython-nocov'
121123
cibw_arch: 'aarch64'
122124
cibw_build: 'cp38-*manylinux*'
125+
artifact: 'ubuntu-aarch64-manylinux'
123126
os: 'ubuntu-latest'
124127
- name: 'py38-cython-nocov (ubuntu/aarch64/musllinux)'
125128
python: '3.8'
@@ -128,6 +131,7 @@ jobs:
128131
tox_env: 'py38-cython-nocov'
129132
cibw_arch: 'aarch64'
130133
cibw_build: 'cp38-*musllinux*'
134+
artifact: 'ubuntu-aarch64-musllinux'
131135
os: 'ubuntu-latest'
132136
- name: 'py38-cython-nocov (windows/AMD64)'
133137
python: '3.8'
@@ -136,6 +140,7 @@ jobs:
136140
tox_env: 'py38-cython-nocov'
137141
cibw_arch: 'AMD64'
138142
cibw_build: 'cp38-*'
143+
artifact: 'windows-AMD64-default'
139144
os: 'windows-latest'
140145
- name: 'py38-cython-nocov (windows/x86)'
141146
python: '3.8'
@@ -144,6 +149,7 @@ jobs:
144149
tox_env: 'py38-cython-nocov'
145150
cibw_arch: 'x86'
146151
cibw_build: 'cp38-*'
152+
artifact: 'windows-x86-default'
147153
os: 'windows-latest'
148154
- name: 'py38-cython-nocov (macos/arm64)'
149155
python: '3.8'
@@ -152,6 +158,7 @@ jobs:
152158
tox_env: 'py38-cython-nocov'
153159
cibw_arch: 'arm64'
154160
cibw_build: 'cp38-*'
161+
artifact: 'macos-arm64-default'
155162
os: 'macos-latest'
156163
- name: 'py39-pure-cover (ubuntu/x86_64)'
157164
python: '3.9'
@@ -238,6 +245,7 @@ jobs:
238245
tox_env: 'py39-cython-nocov'
239246
cibw_arch: 'x86_64'
240247
cibw_build: 'cp39-*manylinux*'
248+
artifact: 'ubuntu-x86_64-manylinux'
241249
os: 'ubuntu-latest'
242250
- name: 'py39-cython-nocov (ubuntu/x86_64/musllinux)'
243251
python: '3.9'
@@ -246,6 +254,7 @@ jobs:
246254
tox_env: 'py39-cython-nocov'
247255
cibw_arch: 'x86_64'
248256
cibw_build: 'cp39-*musllinux*'
257+
artifact: 'ubuntu-x86_64-musllinux'
249258
os: 'ubuntu-latest'
250259
- name: 'py39-cython-nocov (ubuntu/aarch64/manylinux)'
251260
python: '3.9'
@@ -254,6 +263,7 @@ jobs:
254263
tox_env: 'py39-cython-nocov'
255264
cibw_arch: 'aarch64'
256265
cibw_build: 'cp39-*manylinux*'
266+
artifact: 'ubuntu-aarch64-manylinux'
257267
os: 'ubuntu-latest'
258268
- name: 'py39-cython-nocov (ubuntu/aarch64/musllinux)'
259269
python: '3.9'
@@ -262,6 +272,7 @@ jobs:
262272
tox_env: 'py39-cython-nocov'
263273
cibw_arch: 'aarch64'
264274
cibw_build: 'cp39-*musllinux*'
275+
artifact: 'ubuntu-aarch64-musllinux'
265276
os: 'ubuntu-latest'
266277
- name: 'py39-cython-nocov (windows/AMD64)'
267278
python: '3.9'
@@ -270,6 +281,7 @@ jobs:
270281
tox_env: 'py39-cython-nocov'
271282
cibw_arch: 'AMD64'
272283
cibw_build: 'cp39-*'
284+
artifact: 'windows-AMD64-default'
273285
os: 'windows-latest'
274286
- name: 'py39-cython-nocov (windows/x86)'
275287
python: '3.9'
@@ -278,6 +290,7 @@ jobs:
278290
tox_env: 'py39-cython-nocov'
279291
cibw_arch: 'x86'
280292
cibw_build: 'cp39-*'
293+
artifact: 'windows-x86-default'
281294
os: 'windows-latest'
282295
- name: 'py39-cython-nocov (macos/arm64)'
283296
python: '3.9'
@@ -286,6 +299,7 @@ jobs:
286299
tox_env: 'py39-cython-nocov'
287300
cibw_arch: 'arm64'
288301
cibw_build: 'cp39-*'
302+
artifact: 'macos-arm64-default'
289303
os: 'macos-latest'
290304
- name: 'py310-pure-cover (ubuntu/x86_64)'
291305
python: '3.10'
@@ -372,6 +386,7 @@ jobs:
372386
tox_env: 'py310-cython-nocov'
373387
cibw_arch: 'x86_64'
374388
cibw_build: 'cp310-*manylinux*'
389+
artifact: 'ubuntu-x86_64-manylinux'
375390
os: 'ubuntu-latest'
376391
- name: 'py310-cython-nocov (ubuntu/x86_64/musllinux)'
377392
python: '3.10'
@@ -380,6 +395,7 @@ jobs:
380395
tox_env: 'py310-cython-nocov'
381396
cibw_arch: 'x86_64'
382397
cibw_build: 'cp310-*musllinux*'
398+
artifact: 'ubuntu-x86_64-musllinux'
383399
os: 'ubuntu-latest'
384400
- name: 'py310-cython-nocov (ubuntu/aarch64/manylinux)'
385401
python: '3.10'
@@ -388,6 +404,7 @@ jobs:
388404
tox_env: 'py310-cython-nocov'
389405
cibw_arch: 'aarch64'
390406
cibw_build: 'cp310-*manylinux*'
407+
artifact: 'ubuntu-aarch64-manylinux'
391408
os: 'ubuntu-latest'
392409
- name: 'py310-cython-nocov (ubuntu/aarch64/musllinux)'
393410
python: '3.10'
@@ -396,6 +413,7 @@ jobs:
396413
tox_env: 'py310-cython-nocov'
397414
cibw_arch: 'aarch64'
398415
cibw_build: 'cp310-*musllinux*'
416+
artifact: 'ubuntu-aarch64-musllinux'
399417
os: 'ubuntu-latest'
400418
- name: 'py310-cython-nocov (windows/AMD64)'
401419
python: '3.10'
@@ -404,6 +422,7 @@ jobs:
404422
tox_env: 'py310-cython-nocov'
405423
cibw_arch: 'AMD64'
406424
cibw_build: 'cp310-*'
425+
artifact: 'windows-AMD64-default'
407426
os: 'windows-latest'
408427
- name: 'py310-cython-nocov (windows/x86)'
409428
python: '3.10'
@@ -412,6 +431,7 @@ jobs:
412431
tox_env: 'py310-cython-nocov'
413432
cibw_arch: 'x86'
414433
cibw_build: 'cp310-*'
434+
artifact: 'windows-x86-default'
415435
os: 'windows-latest'
416436
- name: 'py310-cython-nocov (macos/arm64)'
417437
python: '3.10'
@@ -420,6 +440,7 @@ jobs:
420440
tox_env: 'py310-cython-nocov'
421441
cibw_arch: 'arm64'
422442
cibw_build: 'cp310-*'
443+
artifact: 'macos-arm64-default'
423444
os: 'macos-latest'
424445
- name: 'py311-pure-cover (ubuntu/x86_64)'
425446
python: '3.11'
@@ -506,6 +527,7 @@ jobs:
506527
tox_env: 'py311-cython-nocov'
507528
cibw_arch: 'x86_64'
508529
cibw_build: 'cp311-*manylinux*'
530+
artifact: 'ubuntu-x86_64-manylinux'
509531
os: 'ubuntu-latest'
510532
- name: 'py311-cython-nocov (ubuntu/x86_64/musllinux)'
511533
python: '3.11'
@@ -514,6 +536,7 @@ jobs:
514536
tox_env: 'py311-cython-nocov'
515537
cibw_arch: 'x86_64'
516538
cibw_build: 'cp311-*musllinux*'
539+
artifact: 'ubuntu-x86_64-musllinux'
517540
os: 'ubuntu-latest'
518541
- name: 'py311-cython-nocov (ubuntu/aarch64/manylinux)'
519542
python: '3.11'
@@ -522,6 +545,7 @@ jobs:
522545
tox_env: 'py311-cython-nocov'
523546
cibw_arch: 'aarch64'
524547
cibw_build: 'cp311-*manylinux*'
548+
artifact: 'ubuntu-aarch64-manylinux'
525549
os: 'ubuntu-latest'
526550
- name: 'py311-cython-nocov (ubuntu/aarch64/musllinux)'
527551
python: '3.11'
@@ -530,6 +554,7 @@ jobs:
530554
tox_env: 'py311-cython-nocov'
531555
cibw_arch: 'aarch64'
532556
cibw_build: 'cp311-*musllinux*'
557+
artifact: 'ubuntu-aarch64-musllinux'
533558
os: 'ubuntu-latest'
534559
- name: 'py311-cython-nocov (windows/AMD64)'
535560
python: '3.11'
@@ -538,6 +563,7 @@ jobs:
538563
tox_env: 'py311-cython-nocov'
539564
cibw_arch: 'AMD64'
540565
cibw_build: 'cp311-*'
566+
artifact: 'windows-AMD64-default'
541567
os: 'windows-latest'
542568
- name: 'py311-cython-nocov (windows/x86)'
543569
python: '3.11'
@@ -546,6 +572,7 @@ jobs:
546572
tox_env: 'py311-cython-nocov'
547573
cibw_arch: 'x86'
548574
cibw_build: 'cp311-*'
575+
artifact: 'windows-x86-default'
549576
os: 'windows-latest'
550577
- name: 'py311-cython-nocov (macos/arm64)'
551578
python: '3.11'
@@ -554,6 +581,7 @@ jobs:
554581
tox_env: 'py311-cython-nocov'
555582
cibw_arch: 'arm64'
556583
cibw_build: 'cp311-*'
584+
artifact: 'macos-arm64-default'
557585
os: 'macos-latest'
558586
- name: 'py312-pure-cover (ubuntu/x86_64)'
559587
python: '3.12'
@@ -640,6 +668,7 @@ jobs:
640668
tox_env: 'py312-cython-nocov'
641669
cibw_arch: 'x86_64'
642670
cibw_build: 'cp312-*manylinux*'
671+
artifact: 'ubuntu-x86_64-manylinux'
643672
os: 'ubuntu-latest'
644673
- name: 'py312-cython-nocov (ubuntu/x86_64/musllinux)'
645674
python: '3.12'
@@ -648,6 +677,7 @@ jobs:
648677
tox_env: 'py312-cython-nocov'
649678
cibw_arch: 'x86_64'
650679
cibw_build: 'cp312-*musllinux*'
680+
artifact: 'ubuntu-x86_64-musllinux'
651681
os: 'ubuntu-latest'
652682
- name: 'py312-cython-nocov (ubuntu/aarch64/manylinux)'
653683
python: '3.12'
@@ -656,6 +686,7 @@ jobs:
656686
tox_env: 'py312-cython-nocov'
657687
cibw_arch: 'aarch64'
658688
cibw_build: 'cp312-*manylinux*'
689+
artifact: 'ubuntu-aarch64-manylinux'
659690
os: 'ubuntu-latest'
660691
- name: 'py312-cython-nocov (ubuntu/aarch64/musllinux)'
661692
python: '3.12'
@@ -664,6 +695,7 @@ jobs:
664695
tox_env: 'py312-cython-nocov'
665696
cibw_arch: 'aarch64'
666697
cibw_build: 'cp312-*musllinux*'
698+
artifact: 'ubuntu-aarch64-musllinux'
667699
os: 'ubuntu-latest'
668700
- name: 'py312-cython-nocov (windows/AMD64)'
669701
python: '3.12'
@@ -672,6 +704,7 @@ jobs:
672704
tox_env: 'py312-cython-nocov'
673705
cibw_arch: 'AMD64'
674706
cibw_build: 'cp312-*'
707+
artifact: 'windows-AMD64-default'
675708
os: 'windows-latest'
676709
- name: 'py312-cython-nocov (windows/x86)'
677710
python: '3.12'
@@ -680,6 +713,7 @@ jobs:
680713
tox_env: 'py312-cython-nocov'
681714
cibw_arch: 'x86'
682715
cibw_build: 'cp312-*'
716+
artifact: 'windows-x86-default'
683717
os: 'windows-latest'
684718
- name: 'py312-cython-nocov (macos/arm64)'
685719
python: '3.12'
@@ -688,6 +722,7 @@ jobs:
688722
tox_env: 'py312-cython-nocov'
689723
cibw_arch: 'arm64'
690724
cibw_build: 'cp312-*'
725+
artifact: 'macos-arm64-default'
691726
os: 'macos-latest'
692727
- name: 'pypy38-pure-cover (ubuntu/x86_64)'
693728
python: 'pypy-3.8'
@@ -1055,7 +1090,7 @@ jobs:
10551090
uses: actions/upload-artifact@v4
10561091
if: matrix.cibw_build
10571092
with:
1058-
name: 'wheel-${{ matrix.cibw_build }}-${{ matrix.cibw_arch }}'
1093+
name: '${{ matrix.artifact }}'
10591094
if-no-files-found: error
10601095
compression-level: 0
10611096
path: wheelhouse/*.whl

‎ci/templates/.github/workflows/github-actions.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
cibw_arch: '{{ cibw_arch }}'
5454
{% if env.endswith('cython-nocov') and not prefix.startswith('pypy') %}
5555
cibw_build: '{{ cpython }}-{{ wheel_arch }}'
56+
artifact: '{{ os }}-{{ cibw_arch }}-{{ wheel_arch.strip("*") or "default" }}'
5657
{% else %}
5758
cibw_build: false
5859
{% endif %}
@@ -120,7 +121,7 @@ jobs:
120121
uses: actions/upload-artifact@v4
121122
if: matrix.cibw_build
122123
with:
123-
name: '{{ 'wheel-${{ matrix.cibw_build }}-${{ matrix.cibw_arch }}' }}'
124+
name: '{{ '${{ matrix.artifact }}' }}'
124125
if-no-files-found: error
125126
compression-level: 0
126127
path: wheelhouse/*.whl

0 commit comments

Comments
 (0)