Skip to content

Commit e64216e

Browse files
authored
Merge branch 'main' into patch-1
2 parents 7f8e45d + 29867d3 commit e64216e

File tree

3 files changed

+235
-123
lines changed

3 files changed

+235
-123
lines changed

.github/workflows/test-and-publish.yaml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ jobs:
180180
BUILD_DOCS=1 BUILD_TYPE=None poetry install
181181
- name: Upload Doxygen-generated docs as CI artifacts
182182
if: ${{ matrix.os == 'ubuntu-20.04' && matrix.python_version == '3.11' }}
183-
uses: actions/upload-artifact@v3
183+
uses: actions/upload-artifact@v4
184184
with:
185185
name: docs-${{ github.run_id }}-${{ github.sha }}
186186
path: ./build/docs/html/
@@ -218,9 +218,9 @@ jobs:
218218
mv "$file" "$(echo "$file" | sed -E 's/macosx_[0-9]+_[0-9]+/macosx_11_0/')";
219219
done
220220
- name: Upload wheel as CI artifacts
221-
uses: actions/upload-artifact@v3
221+
uses: actions/upload-artifact@v4
222222
with:
223-
name: wheel-${{ github.run_id }}-${{ github.sha }}
223+
name: wheel-${{ github.run_id }}-${{ github.sha }}-${{ runner.os }}_${{ runner.arch }}_Python${{ matrix.python_version }}
224224
path: ./dist/
225225
- name: Set cores to get stored in /cores
226226
if: ${{ matrix.os != 'windows-2022' }}
@@ -257,7 +257,7 @@ jobs:
257257
with:
258258
credentials: "admin:admin"
259259
- name: Upload core dumps as CI artifacts
260-
uses: actions/upload-artifact@v3
260+
uses: actions/upload-artifact@v4
261261
if: ${{ matrix.os != 'windows-2022' && failure() }}
262262
# TODO (Caleb Aikens) figure out how to get Windows core dumps
263263
with:
@@ -282,9 +282,9 @@ jobs:
282282
poetry build --format=sdist
283283
ls -lah ./dist/
284284
- name: Upload sdist as CI artifacts
285-
uses: actions/upload-artifact@v3
285+
uses: actions/upload-artifact@v4
286286
with:
287-
name: wheel-${{ github.run_id }}-${{ github.sha }}
287+
name: wheel-${{ github.run_id }}-${{ github.sha }}-sdist
288288
path: ./dist/
289289
check-install-from-sdist:
290290
needs: sdist
@@ -294,9 +294,9 @@ jobs:
294294
with:
295295
python-version: '3.10'
296296
- name: Download wheels built
297-
uses: actions/download-artifact@v3
297+
uses: actions/download-artifact@v4
298298
with:
299-
name: wheel-${{ github.run_id }}-${{ github.sha }}
299+
name: wheel-${{ github.run_id }}-${{ github.sha }}-sdist
300300
path: ./dist/
301301
- run: pip install ./dist/pythonmonkey-*.tar.gz
302302
publish:
@@ -310,9 +310,10 @@ jobs:
310310
python-version: '3.9'
311311
- run: pip install twine
312312
- name: Download wheels built
313-
uses: actions/download-artifact@v3
313+
uses: actions/download-artifact@v4
314314
with:
315-
name: wheel-${{ github.run_id }}-${{ github.sha }}
315+
pattern: wheel-${{ github.run_id }}-${{ github.sha }}-*
316+
merge-multiple: true
316317
path: ./dist/
317318
- run: ls -lah ./dist/
318319
- name: Publish package
@@ -335,12 +336,13 @@ jobs:
335336
steps:
336337
# don't checkout
337338
- name: Download wheels built
338-
uses: actions/download-artifact@v3
339+
uses: actions/download-artifact@v4
339340
with:
340-
name: wheel-${{ github.run_id }}-${{ github.sha }}
341+
pattern: wheel-${{ github.run_id }}-${{ github.sha }}-*
342+
merge-multiple: true
341343
path: ./dist/
342344
- name: Download docs html generated by Doxygen
343-
uses: actions/download-artifact@v3
345+
uses: actions/download-artifact@v4
344346
with:
345347
name: docs-${{ github.run_id }}-${{ github.sha }}
346348
path: ./docs/
@@ -374,12 +376,12 @@ jobs:
374376
html+="<li><a href="pminit/">pminit</a></li>"
375377
html+="</body></html>"
376378
echo "$html" > ./index.html
377-
- uses: actions/upload-pages-artifact@v1
379+
- uses: actions/upload-pages-artifact@v3
378380
with:
379381
path: ./
380382
- name: Deploy to GitHub Pages
381383
id: deployment
382-
uses: actions/deploy-pages@v2
384+
uses: actions/deploy-pages@v4
383385
publish-archive:
384386
# Publish to ⊇istributive's archive server (https://archive.distributed.computer/releases/pythonmonkey/)
385387
needs: [build-and-test, sdist]
@@ -391,12 +393,13 @@ jobs:
391393
steps:
392394
# no need to checkout
393395
- name: Download wheels built
394-
uses: actions/download-artifact@v3
396+
uses: actions/download-artifact@v4
395397
with:
396-
name: wheel-${{ github.run_id }}-${{ github.sha }}
398+
pattern: wheel-${{ github.run_id }}-${{ github.sha }}-*
399+
merge-multiple: true
397400
path: ./
398401
- name: Download docs html generated by Doxygen
399-
uses: actions/download-artifact@v3
402+
uses: actions/download-artifact@v4
400403
with:
401404
name: docs-${{ github.run_id }}-${{ github.sha }}
402405
path: ./docs/

0 commit comments

Comments
 (0)