Automated pull from upstream beta#2397
Merged
bors-ferrocene[bot] merged 7 commits intoJun 15, 2026
Merged
Conversation
(cherry picked from commit 52bedb4)
[beta] bump stage0, plus a backport https://forge.rust-lang.org/release/process.html#beta-stage0-update-friday - Bump stage0 to stable 1.96.0 - Extend macOS deployment target mismatch filter to cover dylib and new ld formats rust-lang/rust#156814 r? cuviper
1 commits in c25859fade01b233823818c447cf8ec779a5760c..31bcf52c870d00e7b993ec65fdb888ea12bc2052 2026-05-25 17:16:01 +0200 to 2026-05-28 22:54:42 -0400 - [1.97] bump cargo-util-schemas to 0.14.1 (rust-lang/cargo#17047)
[beta 1.97] Update cargo 1 commits in c25859fade01b233823818c447cf8ec779a5760c..31bcf52c870d00e7b993ec65fdb888ea12bc2052 2026-05-25 17:16:01 +0200 to 2026-05-28 22:54:42 -0400 - [1.97] bump cargo-util-schemas to 0.14.1 (rust-lang/cargo#17047)
This commit is generated by `ferrocene/tools/pull-upstream/pull.sh`. The list of excluded files is defined in `.gitattributes`.
ferrocene-automations
Bot
added
automation
bors-ferrocene Bot
added a commit
that referenced
this pull request
Jun 11, 2026
2397: Automated pull from upstream `beta` r=tshepang a=ferrocene-automations[bot] :warning: **The automation reported these warnings:** :warning: * Couldn't regenerate the symbol report. Please run './x test ferrocene/doc/symbol-report.csv --bless' after fixing the conflicts. This PR pulls the following changes from the upstream repository: * `157548`: [[beta 1.97] Update cargo](https://www.github.com/rust-lang/rust/issues/157548) * `157086`: [[beta] bump stage0, plus a backport](https://www.github.com/rust-lang/rust/issues/157086) Co-authored-by: Josh Stone <[email protected]> Co-authored-by: cezarbbb <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: Eric Huss <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Contributor
|
Build failed:
|
Member
|
flaky ci... |
bors-ferrocene Bot
added a commit
that referenced
this pull request
Jun 12, 2026
2397: Automated pull from upstream `beta` r=tshepang a=ferrocene-automations[bot] :warning: **The automation reported these warnings:** :warning: * Couldn't regenerate the symbol report. Please run './x test ferrocene/doc/symbol-report.csv --bless' after fixing the conflicts. This PR pulls the following changes from the upstream repository: * `157548`: [[beta 1.97] Update cargo](https://www.github.com/rust-lang/rust/issues/157548) * `157086`: [[beta] bump stage0, plus a backport](https://www.github.com/rust-lang/rust/issues/157086) Co-authored-by: Josh Stone <[email protected]> Co-authored-by: cezarbbb <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: Eric Huss <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Member
|
bors cancel Blocked by #2399. |
Contributor
|
Canceled. |
Member
|
bors merge |
bors-ferrocene Bot
added a commit
that referenced
this pull request
Jun 13, 2026
2397: Automated pull from upstream `beta` r=tshepang a=ferrocene-automations[bot] :warning: **The automation reported these warnings:** :warning: * Couldn't regenerate the symbol report. Please run './x test ferrocene/doc/symbol-report.csv --bless' after fixing the conflicts. This PR pulls the following changes from the upstream repository: * `157548`: [[beta 1.97] Update cargo](https://www.github.com/rust-lang/rust/issues/157548) * `157086`: [[beta] bump stage0, plus a backport](https://www.github.com/rust-lang/rust/issues/157086) 2401: Backport to `release/1.97` r=tshepang a=ferrocene-automations[bot] This PR backports the following PRs to the `release/1.97` branch: * #2399 Note that the automation failed to backport some PRs automatically. Check out the [backport:manual](https://github.com/ferrocene/ferrocene/pulls?q=is%3Apr+label%3Abackport%3Amanual) for a list of them. Co-authored-by: Josh Stone <[email protected]> Co-authored-by: cezarbbb <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: Eric Huss <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Urhengulas <[email protected]>
Contributor
|
Build failed (retrying...): |
bors-ferrocene Bot
added a commit
that referenced
this pull request
Jun 13, 2026
2397: Automated pull from upstream `beta` r=tshepang a=ferrocene-automations[bot] :warning: **The automation reported these warnings:** :warning: * Couldn't regenerate the symbol report. Please run './x test ferrocene/doc/symbol-report.csv --bless' after fixing the conflicts. This PR pulls the following changes from the upstream repository: * `157548`: [[beta 1.97] Update cargo](https://www.github.com/rust-lang/rust/issues/157548) * `157086`: [[beta] bump stage0, plus a backport](https://www.github.com/rust-lang/rust/issues/157086) Co-authored-by: Josh Stone <[email protected]> Co-authored-by: cezarbbb <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: Eric Huss <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Contributor
|
Build failed:
|
Member
|
flaky ci... |
Contributor
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR pulls the following changes from the upstream repository:
157548: [beta 1.97] Update cargo157086: [beta] bump stage0, plus a backport