Skip to content

Commit 25ebeef

Browse files
1 parent d299cda commit 25ebeef

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

.github/workflows/release.yml

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
env:
1212
OS_LIST_UBUNTU: '["ubuntu-latest"]'
13-
OS_LIST_ALL: '["ubuntu-latest", "windows-latest", "macos-latest", "macos-13"]'
13+
OS_LIST_ALL: '["ubuntu-latest", "windows-latest", "macos-latest", "macos-15-intel"]'
1414

1515

1616
jobs:
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v6
3838
with:
3939
fetch-depth: 0
4040

@@ -43,7 +43,7 @@ jobs:
4343
run: git tag -d $(git tag --points-at HEAD)
4444

4545
- name: Install Python
46-
uses: actions/setup-python@v5
46+
uses: actions/setup-python@v6
4747
with:
4848
python-version: '3.x'
4949

@@ -222,7 +222,7 @@ jobs:
222222

223223
steps:
224224
- name: Checkout
225-
uses: actions/checkout@v4
225+
uses: actions/checkout@v6
226226
with:
227227
fetch-depth: 0
228228

@@ -231,7 +231,7 @@ jobs:
231231
run: git tag -d $(git tag --points-at HEAD)
232232

233233
- name: Install Python
234-
uses: actions/setup-python@v5
234+
uses: actions/setup-python@v6
235235
with:
236236
python-version: ${{ env.DEFAULT_PYTHON }}
237237

@@ -252,7 +252,7 @@ jobs:
252252

253253
- name: Upload artifact
254254
if: env.PURE == 'false' || strategy.job-index == 0
255-
uses: actions/upload-artifact@v4
255+
uses: actions/upload-artifact@v6
256256
with:
257257
name: dist-${{ matrix.os }}
258258
path: ./dist
@@ -264,7 +264,7 @@ jobs:
264264
miniforge-version: "latest"
265265
auto-update-conda: true
266266
conda-remove-defaults: true
267-
auto-activate-base: true
267+
auto-activate: true
268268
activate-environment: ""
269269

270270
- name: Conda package
@@ -274,11 +274,11 @@ jobs:
274274
# Short path to minimise odds of hitting Windows max path length
275275
CONDA_BUILD_ARGS+=" --croot ${{ runner.temp }}\cb"
276276
fi
277-
conda install -c labscript-suite setuptools-conda "conda-build<25"
277+
conda install -c labscript-suite setuptools-conda
278278
setuptools-conda build $CONDA_BUILD_ARGS .
279279
280280
- name: Upload artifact
281-
uses: actions/upload-artifact@v4
281+
uses: actions/upload-artifact@v6
282282
with:
283283
name: conda_packages-${{ matrix.os }}
284284
path: ./conda_packages
@@ -298,7 +298,7 @@ jobs:
298298

299299
steps:
300300
- name: Download Artifact
301-
uses: actions/download-artifact@v4
301+
uses: actions/download-artifact@v8
302302
with:
303303
pattern: dist*
304304
path: ./dist
@@ -332,7 +332,7 @@ jobs:
332332

333333
steps:
334334
- name: Download Artifact
335-
uses: actions/download-artifact@v4
335+
uses: actions/download-artifact@v8
336336
with:
337337
pattern: dist*
338338
path: ./dist
@@ -342,6 +342,8 @@ jobs:
342342
uses: pypa/gh-action-pypi-publish@release/v1
343343
with:
344344
repository-url: https://test.pypi.org/legacy/
345+
verbose: true
346+
skip-existing: true
345347

346348

347349
pypi-upload:
@@ -360,14 +362,17 @@ jobs:
360362

361363
steps:
362364
- name: Download Artifact
363-
uses: actions/download-artifact@v4
365+
uses: actions/download-artifact@v8
364366
with:
365367
pattern: dist*
366368
path: ./dist
367369
merge-multiple: true
368370

369371
- name: Publish on PyPI
370372
uses: pypa/gh-action-pypi-publish@release/v1
373+
with:
374+
verbose: true
375+
skip-existing: true
371376

372377

373378
test-anaconda-upload:
@@ -378,7 +383,7 @@ jobs:
378383

379384
steps:
380385
- name: Download Artifact
381-
uses: actions/download-artifact@v4
386+
uses: actions/download-artifact@v8
382387
with:
383388
pattern: conda_packages-*
384389
path: ./conda_packages
@@ -390,7 +395,7 @@ jobs:
390395
miniforge-version: "latest"
391396
auto-update-conda: true
392397
conda-remove-defaults: true
393-
auto-activate-base: true
398+
auto-activate: true
394399
activate-environment: ""
395400

396401
- name: Install Anaconda cloud client
@@ -417,7 +422,7 @@ jobs:
417422

418423
steps:
419424
- name: Download Artifact
420-
uses: actions/download-artifact@v4
425+
uses: actions/download-artifact@v8
421426
with:
422427
pattern: conda_packages-*
423428
path: ./conda_packages
@@ -429,7 +434,7 @@ jobs:
429434
miniforge-version: "latest"
430435
auto-update-conda: true
431436
conda-remove-defaults: true
432-
auto-activate-base: true
437+
auto-activate: true
433438
activate-environment: ""
434439

435440
- name: Install Anaconda cloud client

0 commit comments

Comments
 (0)