Skip to content

Commit 0b22f0c

Browse files
committed
Auto merge of rust-lang#3761 - rust-lang:rustup-2024-07-24, r=RalfJung
Automatic Rustup
2 parents b7b2305 + 675a5ba commit 0b22f0c

File tree

670 files changed

+16068
-7029
lines changed

Some content is hidden

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

670 files changed

+16068
-7029
lines changed

.github/workflows/dependencies.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,17 @@ jobs:
6464
- name: cargo update
6565
# Remove first line that always just says "Updating crates.io index"
6666
run: cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
67+
- name: cargo update rustbook
68+
run: |
69+
echo -e "\nrustbook dependencies:" >> cargo_update.log
70+
cargo update --manifest-path src/tools/rustbook 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
6771
- name: upload Cargo.lock artifact for use in PR
6872
uses: actions/upload-artifact@v4
6973
with:
7074
name: Cargo-lock
71-
path: Cargo.lock
75+
path: |
76+
Cargo.lock
77+
src/tools/rustbook/Cargo.lock
7278
retention-days: 1
7379
- name: upload cargo-update log artifact for use in PR
7480
uses: actions/upload-artifact@v4
@@ -113,7 +119,7 @@ jobs:
113119
git config user.name github-actions
114120
git config user.email [email protected]
115121
git switch --force-create cargo_update
116-
git add ./Cargo.lock
122+
git add ./Cargo.lock ./src/tools/rustbook/Cargo.lock
117123
git commit --no-verify --file=commit.txt
118124
119125
- name: push

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ build/
5050
/target
5151
/src/bootstrap/target
5252
/src/tools/x/target
53-
/inc-fat/
5453
# Created by default with `src/ci/docker/run.sh`
5554
/obj/
5655
/rustc-ice*

.reuse/dep5

Lines changed: 0 additions & 124 deletions
This file was deleted.

0 commit comments

Comments
 (0)