Skip to content

Commit 751b0a4

Browse files
authored
Merge pull request hyperspy#140 from hyperspy/dependabot/github_actions/actions-552e09b412
Bump the actions group across 1 directory with 4 updates
2 parents 18f3f1b + f561100 commit 751b0a4

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

.github/workflows/docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
permissions:
1818
contents: read
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
with:
2222
fetch-depth: 0
2323
- uses: conda-incubator/setup-miniconda@v3
@@ -53,7 +53,7 @@ jobs:
5353
cd docs
5454
make html
5555
56-
- uses: actions/upload-artifact@v4
56+
- uses: actions/upload-artifact@v5
5757
with:
5858
path: ${{ env.DOCS_PATH }}
5959
name: docs_html
@@ -66,12 +66,12 @@ jobs:
6666
# needs write permission to push the docs to gh-pages
6767
contents: write
6868
steps:
69-
- uses: actions/checkout@v5
69+
- uses: actions/checkout@v6
7070
with:
7171
fetch-depth: 0
7272
ref: gh-pages
7373

74-
- uses: actions/download-artifact@v5
74+
- uses: actions/download-artifact@v6
7575
with:
7676
name: docs_html
7777
path: .

.github/workflows/release.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ env:
2222
# pytest-qt doesn't seem to be playing well when pyqt5 and pyside6
2323
# are installed in the same environment
2424
PYTEST_QT_API: pyqt5
25-
TEST_DEPS: pytest pytest-qt pytest-xdist pytest-rerunfailures pytest-mpl filelock
25+
# workaround for https://github.com/pyxem/pyxem/pull/1175
26+
TEST_DEPS: '"pytest<9" pytest-qt pytest-xdist pytest-rerunfailures pytest-mpl filelock'
2627

2728
jobs:
2829
create_release_job:
@@ -32,7 +33,7 @@ jobs:
3233
ID: ${{ steps.create_release.outputs.id }}
3334
VERSION: ${{ env.VERSION }}
3435
steps:
35-
- uses: actions/checkout@v5
36+
- uses: actions/checkout@v6
3637

3738
- name: Get version (on tag)
3839
if: startsWith(github.ref, 'refs/tags/')
@@ -60,7 +61,7 @@ jobs:
6061
- name: Create Release
6162
if: startsWith(github.ref, 'refs/tags/')
6263
id: create_release
63-
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5
64+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
6465
env:
6566
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions
6667
with:
@@ -120,7 +121,7 @@ jobs:
120121
shell: bash -el {0}
121122

122123
steps:
123-
- uses: actions/checkout@v5
124+
- uses: actions/checkout@v6
124125
- uses: conda-incubator/setup-miniconda@v3
125126
with:
126127
miniforge-version: latest
@@ -144,6 +145,12 @@ jobs:
144145
run: |
145146
constructor -v conda_distribution
146147
148+
- name: Clean constructor cache
149+
if: runner.os != 'windows'
150+
# PermissionError on windows
151+
run: |
152+
constructor --clean
153+
147154
- name: Set asset name
148155
env:
149156
ext: ${{ matrix.INSTALLER_EXTENSION }}
@@ -197,7 +204,7 @@ jobs:
197204
198205
- name: Upload artifact
199206
if: startsWith(github.ref, 'refs/tags/') != true
200-
uses: actions/upload-artifact@v4
207+
uses: actions/upload-artifact@v5
201208
with:
202209
path: ${{ env.asset_name }}
203210
name: ${{ env.asset_name }}
@@ -310,7 +317,7 @@ jobs:
310317
311318
- name: Upload Release Asset
312319
if: startsWith(github.ref, 'refs/tags/')
313-
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5
320+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
314321
env:
315322
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
316323
with:
@@ -329,7 +336,7 @@ jobs:
329336
WP_DIR_NAME: WPy64-31280
330337

331338
steps:
332-
- uses: actions/checkout@v5
339+
- uses: actions/checkout@v6
333340
- name: Download Winpython
334341
run: |
335342
Invoke-WebRequest -OutFile ${{ env.WP_EXE }} ${{ env.WP_URL }}
@@ -382,7 +389,7 @@ jobs:
382389
383390
- name: Upload artifact
384391
if: startsWith(github.ref, 'refs/tags/') != true
385-
uses: actions/upload-artifact@v4
392+
uses: actions/upload-artifact@v5
386393
with:
387394
path: ${{ env.asset_name }}
388395
name: ${{ env.asset_name }}
@@ -493,7 +500,7 @@ jobs:
493500
494501
- name: Upload Release Asset
495502
if: startsWith(github.ref, 'refs/tags/')
496-
uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5
503+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
497504
env:
498505
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
499506
with:

0 commit comments

Comments
 (0)