Auto merge of #122951 - Nilstrieb:nodejs20, r=Kobzol

Update upload-artifact to v4

This contains a breaking change around artifact merging no longer being done. This was not relied on, so it's fine.
This commit is contained in:
bors 2024-03-25 04:39:30 +00:00
commit fa374a8071
3 changed files with 6 additions and 6 deletions

View file

@ -166,7 +166,7 @@ jobs:
run: src/ci/scripts/create-doc-artifacts.sh run: src/ci/scripts/create-doc-artifacts.sh
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: upload artifacts to github - name: upload artifacts to github
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: "${{ env.DOC_ARTIFACT_NAME }}" name: "${{ env.DOC_ARTIFACT_NAME }}"
path: obj/artifacts/doc path: obj/artifacts/doc
@ -576,7 +576,7 @@ jobs:
run: src/ci/scripts/create-doc-artifacts.sh run: src/ci/scripts/create-doc-artifacts.sh
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: upload artifacts to github - name: upload artifacts to github
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: "${{ env.DOC_ARTIFACT_NAME }}" name: "${{ env.DOC_ARTIFACT_NAME }}"
path: obj/artifacts/doc path: obj/artifacts/doc
@ -715,7 +715,7 @@ jobs:
run: src/ci/scripts/create-doc-artifacts.sh run: src/ci/scripts/create-doc-artifacts.sh
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: upload artifacts to github - name: upload artifacts to github
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: "${{ env.DOC_ARTIFACT_NAME }}" name: "${{ env.DOC_ARTIFACT_NAME }}"
path: obj/artifacts/doc path: obj/artifacts/doc

View file

@ -70,13 +70,13 @@ jobs:
cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
git status --porcelain | grep -q Cargo.lock || gh run cancel ${{ github.run_id }} git status --porcelain | grep -q Cargo.lock || gh run cancel ${{ github.run_id }}
- name: upload Cargo.lock artifact for use in PR - name: upload Cargo.lock artifact for use in PR
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: Cargo-lock name: Cargo-lock
path: Cargo.lock path: Cargo.lock
retention-days: 1 retention-days: 1
- name: upload cargo-update log artifact for use in PR - name: upload cargo-update log artifact for use in PR
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: cargo-updates name: cargo-updates
path: cargo_update.log path: cargo_update.log

View file

@ -261,7 +261,7 @@ x--expand-yaml-anchors--remove:
<<: *step <<: *step
- name: upload artifacts to github - name: upload artifacts to github
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
# name is set in previous step # name is set in previous step
name: ${{ env.DOC_ARTIFACT_NAME }} name: ${{ env.DOC_ARTIFACT_NAME }}