forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#17995 - lnicola:sync-from-rust, r=lnicola
minor: sync from downstream
- Loading branch information
Showing
2,848 changed files
with
39,287 additions
and
26,189 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,16 +64,21 @@ jobs: | |
- name: cargo update | ||
# Remove first line that always just says "Updating crates.io index" | ||
run: cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log | ||
- name: cargo update library | ||
run: | | ||
echo -e "\nlibrary dependencies:" >> cargo_update.log | ||
cargo update --manifest-path library/Cargo.toml 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log | ||
- name: cargo update rustbook | ||
run: | | ||
echo -e "\nrustbook dependencies:" >> cargo_update.log | ||
cargo update --manifest-path src/tools/rustbook 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log | ||
cargo update --manifest-path src/tools/rustbook/Cargo.toml 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log | ||
- name: upload Cargo.lock artifact for use in PR | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: Cargo-lock | ||
path: | | ||
Cargo.lock | ||
library/Cargo.lock | ||
src/tools/rustbook/Cargo.lock | ||
retention-days: 1 | ||
- name: upload cargo-update log artifact for use in PR | ||
|
@@ -119,7 +124,7 @@ jobs: | |
git config user.name github-actions | ||
git config user.email [email protected] | ||
git switch --force-create cargo_update | ||
git add ./Cargo.lock ./src/tools/rustbook/Cargo.lock | ||
git add ./Cargo.lock ./library/Cargo.lock ./src/tools/rustbook/Cargo.lock | ||
git commit --no-verify --file=commit.txt | ||
- name: push | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.