8000 Merge pull request #1046 from python-control/upgrade-download-github-… · python-control/python-control@220ace3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 220ace3

Browse files
murrayrmmurrayrm
authored
Merge pull request #1046 from python-control/upgrade-download-github-action
Upgrade GitHub action dependencies: upload-artifact, download-artifact
2 parents 6d42088 + 3d9baa1 commit 220ace3

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

‎.github/workflows/doctest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
make doctest
3939
4040
- name: Archive results
41-
uses: actions/upload-artifact@v3
41+
uses: actions/upload-artifact@v4
4242
with:
4343
name: doctest-output
4444
path: doc/_build/doctest/output.txt

‎.github/workflows/os-blas-test-matrix.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- .github/scripts/set-conda-pip-matrix.py
1010
- .github/conda-env/build-env.yml
1111
- .github/conda-env/test-env.yml
12-
12+
1313
jobs:
1414
build-pip:
1515
name: Build pip Py${{ matrix.python }}, ${{ matrix.os }}, ${{ matrix.bla_vendor}} BLA_VENDOR
@@ -91,10 +91,11 @@ jobs:
9191
mkdir -p ${wheeldir}
9292
cp ./slycot*.whl ${wheeldir}/
9393
- name: Save wheel
94-
uses: actions/upload-artifact@v3
94+
uses: actions/upload-artifact@v4
9595
with:
96-
name: slycot-wheels
96+
name: slycot-wheels-${{ matrix.os }}-${{ matrix.python }}-${{ matrix.bla_vendor }}
9797
path: slycot-wheels
98+
retention-days: 5
9899

99100

100101
build-conda:
@@ -142,10 +143,11 @@ jobs:
142143
done
143144
python -m conda_index ./slycot-conda-pkgs
144145
- name: Save to local conda pkg channel
145-
uses: actions/upload-artifact@v3
146+
uses: actions/upload-artifact@v4
146147
with:
147-
name: slycot-conda-pkgs
148+
name: slycot-conda-pkgs-${{ matrix.os }}-${{ matrix.python }}
148149
path: slycot-conda-pkgs
150+
retention-days: 5
149151

150152

151153
create-wheel-test-matrix:
@@ -156,10 +158,15 @@ jobs:
156158
outputs:
157159
matrix: ${{ steps.set-matrix.outputs.matrix }}
158160
steps:
161+
- name: Merge artifacts
162+
uses: actions/upload-artifact/merge@v4
163+
with:
164+
name: slycot-wheels
165+
pattern: slycot-wheels-*
159166
- name: Checkout python-control
160167
uses: actions/checkout@v3
161168
- name: Download wheels (if any)
162-
uses: actions/download-artifact@v3
169+
uses: actions/download-artifact@v4
163170
with:
164171
name: slycot-wheels
165172
path: slycot-wheels
@@ -175,10 +182,15 @@ jobs:
175182
outputs:
176183
matrix: ${{ steps.set-matrix.outputs.matrix }}
177184
steps:
185+
- name: Merge artifacts
186+
uses: actions/upload-artifact/merge@v4
187+
with:
188+
name: slycot-conda-pkgs
189+
pattern: slycot-conda-pkgs-*
178190
- name: Checkout python-control
179191
uses: actions/checkout@v3
180192
- name: Download conda packages
181-
uses: actions/download-artifact@v3
193+
uses: actions/download-artifact@v4
182194
with:
183195
name: slycot-conda-pkgs
184196
path: slycot-conda-pkgs
@@ -238,7 +250,7 @@ jobs:
238250
exit 1 ;;
239251
esac
240252
- name: Download wheels
241-
uses: actions/download-artifact@v3
253+
uses: actions/download-artifact@v4
242254
with:
243255
name: slycot-wheels
244256
path: slycot-wheels
@@ -290,7 +302,7 @@ jobs:
290302
channel-priority: strict
291303
auto-activate-base: false
292304
- name: Download conda packages
293-
uses: actions/download-artifact@v3
305+
uses: actions/download-artifact@v4
294306
with:
295307
name: slycot-conda-pkgs
296308
path: slycot-conda-pkgs

0 commit comments

Comments
 (0)
0