summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-12-10 06:01:06 +0100
committerJunio C Hamano <gitster@pobox.com>2022-12-10 06:01:06 +0100
commit481d274aae436b1a84f99e3a000ed67cabe758fa (patch)
tree29916836e975bba2e329e99ec1f63537c64fb6bb /.github
parentMerge branch 'ab/ci-use-macos-12' (diff)
parentci: avoid using deprecated {up,down}load-artifacts Action (diff)
downloadgit-481d274aae436b1a84f99e3a000ed67cabe758fa.tar.xz
git-481d274aae436b1a84f99e3a000ed67cabe758fa.zip
Merge branch 'js/ci-use-newer-up-down-artifact'
CI fix. * js/ci-use-newer-up-down-artifact: ci: avoid using deprecated {up,down}load-artifacts Action
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/main.yml22
1 files changed, 14 insertions, 8 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 71bf71bbe9..e67847a682 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -94,7 +94,7 @@ jobs:
- name: zip up tracked files
run: git archive -o artifacts/tracked.tar.gz HEAD
- name: upload tracked files and build artifacts
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: windows-artifacts
path: artifacts
@@ -108,7 +108,7 @@ jobs:
nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
steps:
- name: download tracked files and build artifacts
- uses: actions/download-artifact@v2
+ uses: actions/download-artifact@v3
with:
name: windows-artifacts
path: ${{github.workspace}}
@@ -125,7 +125,7 @@ jobs:
run: ci/print-test-failures.sh
- name: Upload failed tests' directories
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: failed-tests-windows
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -177,7 +177,7 @@ jobs:
- name: zip up tracked files
run: git archive -o artifacts/tracked.tar.gz HEAD
- name: upload tracked files and build artifacts
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: vs-artifacts
path: artifacts
@@ -192,7 +192,7 @@ jobs:
steps:
- uses: git-for-windows/setup-git-for-windows-sdk@v1
- name: download tracked files and build artifacts
- uses: actions/download-artifact@v2
+ uses: actions/download-artifact@v3
with:
name: vs-artifacts
path: ${{github.workspace}}
@@ -210,7 +210,7 @@ jobs:
run: ci/print-test-failures.sh
- name: Upload failed tests' directories
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: failed-tests-windows
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -269,7 +269,7 @@ jobs:
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
- name: Upload failed tests' directories
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: failed-tests-${{matrix.vector.jobname}}
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -301,7 +301,13 @@ jobs:
- run: ci/print-test-failures.sh
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
- name: Upload failed tests' directories
- if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+ if: failure() && env.FAILED_TEST_ARTIFACTS != '' && matrix.vector.jobname != 'linux32'
+ uses: actions/upload-artifact@v3
+ with:
+ name: failed-tests-${{matrix.vector.jobname}}
+ path: ${{env.FAILED_TEST_ARTIFACTS}}
+ - name: Upload failed tests' directories
+ if: failure() && env.FAILED_TEST_ARTIFACTS != '' && matrix.vector.jobname == 'linux32'
uses: actions/upload-artifact@v1
with:
name: failed-tests-${{matrix.vector.jobname}}