Skip to content

Commit cf1eb93

Browse files
committed
Auto merge of rust-lang#3414 - RalfJung:rustup, r=RalfJung
Rustup Fixes rust-lang/miri#3404
2 parents c461170 + 0d4ef69 commit cf1eb93

File tree

170 files changed

+1783
-747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+1783
-747
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
run: src/ci/scripts/create-doc-artifacts.sh
167167
if: success() && !env.SKIP_JOB
168168
- name: upload artifacts to github
169-
uses: actions/upload-artifact@v3
169+
uses: actions/upload-artifact@v4
170170
with:
171171
name: "${{ env.DOC_ARTIFACT_NAME }}"
172172
path: obj/artifacts/doc
@@ -576,7 +576,7 @@ jobs:
576576
run: src/ci/scripts/create-doc-artifacts.sh
577577
if: success() && !env.SKIP_JOB
578578
- name: upload artifacts to github
579-
uses: actions/upload-artifact@v3
579+
uses: actions/upload-artifact@v4
580580
with:
581581
name: "${{ env.DOC_ARTIFACT_NAME }}"
582582
path: obj/artifacts/doc
@@ -715,7 +715,7 @@ jobs:
715715
run: src/ci/scripts/create-doc-artifacts.sh
716716
if: success() && !env.SKIP_JOB
717717
- name: upload artifacts to github
718-
uses: actions/upload-artifact@v3
718+
uses: actions/upload-artifact@v4
719719
with:
720720
name: "${{ env.DOC_ARTIFACT_NAME }}"
721721
path: obj/artifacts/doc

.github/workflows/dependencies.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ jobs:
7070
cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
7171
git status --porcelain | grep -q Cargo.lock || gh run cancel ${{ github.run_id }}
7272
- name: upload Cargo.lock artifact for use in PR
73-
uses: actions/upload-artifact@v3
73+
uses: actions/upload-artifact@v4
7474
with:
7575
name: Cargo-lock
7676
path: Cargo.lock
7777
retention-days: 1
7878
- name: upload cargo-update log artifact for use in PR
79-
uses: actions/upload-artifact@v3
79+
uses: actions/upload-artifact@v4
8080
with:
8181
name: cargo-updates
8282
path: cargo_update.log

0 commit comments

Comments
 (0)