Skip to content

Commit ec9816c

Browse files
committed
Merge branch 'js/ci-use-newer-up-down-artifact' into maint-2.38
CI fix. * js/ci-use-newer-up-down-artifact: ci: avoid using deprecated {up,down}load-artifacts Action
2 parents 75efbc1 + 1f39844 commit ec9816c

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.github/workflows/main.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
- name: zip up tracked files
9595
run: git archive -o artifacts/tracked.tar.gz HEAD
9696
- name: upload tracked files and build artifacts
97-
uses: actions/upload-artifact@v2
97+
uses: actions/upload-artifact@v3
9898
with:
9999
name: windows-artifacts
100100
path: artifacts
@@ -108,7 +108,7 @@ jobs:
108108
nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
109109
steps:
110110
- name: download tracked files and build artifacts
111-
uses: actions/download-artifact@v2
111+
uses: actions/download-artifact@v3
112112
with:
113113
name: windows-artifacts
114114
path: ${{github.workspace}}
@@ -125,7 +125,7 @@ jobs:
125125
run: ci/print-test-failures.sh
126126
- name: Upload failed tests' directories
127127
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
128-
uses: actions/upload-artifact@v2
128+
uses: actions/upload-artifact@v3
129129
with:
130130
name: failed-tests-windows
131131
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -177,7 +177,7 @@ jobs:
177177
- name: zip up tracked files
178178
run: git archive -o artifacts/tracked.tar.gz HEAD
179179
- name: upload tracked files and build artifacts
180-
uses: actions/upload-artifact@v2
180+
uses: actions/upload-artifact@v3
181181
with:
182182
name: vs-artifacts
183183
path: artifacts
@@ -192,7 +192,7 @@ jobs:
192192
steps:
193193
- uses: git-for-windows/setup-git-for-windows-sdk@v1
194194
- name: download tracked files and build artifacts
195-
uses: actions/download-artifact@v2
195+
uses: actions/download-artifact@v3
196196
with:
197197
name: vs-artifacts
198198
path: ${{github.workspace}}
@@ -210,7 +210,7 @@ jobs:
210210
run: ci/print-test-failures.sh
211211
- name: Upload failed tests' directories
212212
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
213-
uses: actions/upload-artifact@v2
213+
uses: actions/upload-artifact@v3
214214
with:
215215
name: failed-tests-windows
216216
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -265,7 +265,7 @@ jobs:
265265
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
266266
- name: Upload failed tests' directories
267267
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
268-
uses: actions/upload-artifact@v2
268+
uses: actions/upload-artifact@v3
269269
with:
270270
name: failed-tests-${{matrix.vector.jobname}}
271271
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -298,7 +298,13 @@ jobs:
298298
- run: ci/print-test-failures.sh
299299
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
300300
- name: Upload failed tests' directories
301-
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
301+
if: failure() && env.FAILED_TEST_ARTIFACTS != '' && matrix.vector.jobname != 'linux32'
302+
uses: actions/upload-artifact@v3
303+
with:
304+
name: failed-tests-${{matrix.vector.jobname}}
305+
path: ${{env.FAILED_TEST_ARTIFACTS}}
306+
- name: Upload failed tests' directories
307+
if: failure() && env.FAILED_TEST_ARTIFACTS != '' && matrix.vector.jobname == 'linux32'
302308
uses: actions/upload-artifact@v1
303309
with:
304310
name: failed-tests-${{matrix.vector.jobname}}

0 commit comments

Comments
 (0)