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
This commit is contained in:
Junio C Hamano 2022-12-10 14:01:06 +09:00
Родитель 0b32d1aea2 1f398446c3
Коммит 481d274aae
1 изменённых файлов: 14 добавлений и 8 удалений

22
.github/workflows/main.yml поставляемый
Просмотреть файл

@ -94,7 +94,7 @@ jobs:
- name: zip up tracked files - name: zip up tracked files
run: git archive -o artifacts/tracked.tar.gz HEAD run: git archive -o artifacts/tracked.tar.gz HEAD
- name: upload tracked files and build artifacts - name: upload tracked files and build artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: windows-artifacts name: windows-artifacts
path: artifacts path: artifacts
@ -108,7 +108,7 @@ jobs:
nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
steps: steps:
- name: download tracked files and build artifacts - name: download tracked files and build artifacts
uses: actions/download-artifact@v2 uses: actions/download-artifact@v3
with: with:
name: windows-artifacts name: windows-artifacts
path: ${{github.workspace}} path: ${{github.workspace}}
@ -125,7 +125,7 @@ jobs:
run: ci/print-test-failures.sh run: ci/print-test-failures.sh
- name: Upload failed tests' directories - name: Upload failed tests' directories
if: failure() && env.FAILED_TEST_ARTIFACTS != '' if: failure() && env.FAILED_TEST_ARTIFACTS != ''
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: failed-tests-windows name: failed-tests-windows
path: ${{env.FAILED_TEST_ARTIFACTS}} path: ${{env.FAILED_TEST_ARTIFACTS}}
@ -177,7 +177,7 @@ jobs:
- name: zip up tracked files - name: zip up tracked files
run: git archive -o artifacts/tracked.tar.gz HEAD run: git archive -o artifacts/tracked.tar.gz HEAD
- name: upload tracked files and build artifacts - name: upload tracked files and build artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: vs-artifacts name: vs-artifacts
path: artifacts path: artifacts
@ -192,7 +192,7 @@ jobs:
steps: steps:
- uses: git-for-windows/setup-git-for-windows-sdk@v1 - uses: git-for-windows/setup-git-for-windows-sdk@v1
- name: download tracked files and build artifacts - name: download tracked files and build artifacts
uses: actions/download-artifact@v2 uses: actions/download-artifact@v3
with: with:
name: vs-artifacts name: vs-artifacts
path: ${{github.workspace}} path: ${{github.workspace}}
@ -210,7 +210,7 @@ jobs:
run: ci/print-test-failures.sh run: ci/print-test-failures.sh
- name: Upload failed tests' directories - name: Upload failed tests' directories
if: failure() && env.FAILED_TEST_ARTIFACTS != '' if: failure() && env.FAILED_TEST_ARTIFACTS != ''
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: failed-tests-windows name: failed-tests-windows
path: ${{env.FAILED_TEST_ARTIFACTS}} path: ${{env.FAILED_TEST_ARTIFACTS}}
@ -269,7 +269,7 @@ jobs:
if: failure() && env.FAILED_TEST_ARTIFACTS != '' if: failure() && env.FAILED_TEST_ARTIFACTS != ''
- name: Upload failed tests' directories - name: Upload failed tests' directories
if: failure() && env.FAILED_TEST_ARTIFACTS != '' if: failure() && env.FAILED_TEST_ARTIFACTS != ''
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: failed-tests-${{matrix.vector.jobname}} name: failed-tests-${{matrix.vector.jobname}}
path: ${{env.FAILED_TEST_ARTIFACTS}} path: ${{env.FAILED_TEST_ARTIFACTS}}
@ -301,7 +301,13 @@ jobs:
- run: ci/print-test-failures.sh - run: ci/print-test-failures.sh
if: failure() && env.FAILED_TEST_ARTIFACTS != '' if: failure() && env.FAILED_TEST_ARTIFACTS != ''
- name: Upload failed tests' directories - 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 uses: actions/upload-artifact@v1
with: with:
name: failed-tests-${{matrix.vector.jobname}} name: failed-tests-${{matrix.vector.jobname}}