Skip to content

Rustc pull update #20321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
lnicola merged 74 commits into from
Jul 28, 2025
Merged

Rustc pull update #20321

lnicola merged 74 commits into from
Jul 28, 2025
+21 −31

Conversation

@github-actions
Copy link

@github-actions github-actions bot commented Jul 28, 2025

Latest update from rustc.

Kobzol and others added 30 commits April 16, 2025 07:36
@Kobzol
Merge pull request #2337 from xizheyin/sync-code
34c41b8 
Remind to update dev branch while behind too many commits
Merge from rustc
2bdabd0
@tshepang
Merge pull request #2347 from rust-lang/rustc-pull
fbdd1fe 
Rustc pull update
@jieyouxu
Merge pull request #2346 from folkertdev/bootstrap-in-dependencies
5ff907f
@tshepang
Merge pull request #2345 from rust-lang/extraneous
972a124 
toolchain version does not need to be specified
@tshepang
Merge pull request #2343 from hwhsu1231-fork/fix-prefix-chapter
449fc23 
fix(docs): add newlines between prefix/suffix chapters
@jieyouxu
Merge pull request #2352 from xizheyin/enable-behind-upstream
248fd79
Merge from rustc
f8a99af
@tshepang
Merge pull request #2367 from rust-lang/rustc-pull
8926344 
Rustc pull update
Merge from rustc
f2e4fec
@tshepang
Merge pull request #2374 from rust-lang/rustc-pull
275a5d6 
Rustc pull update
@tshepang
Merge pull request #2369 from rust-lang/tshepang-patch-1
d69c0ab 
add rdg push git config entry for git protocol pushers
@tshepang
Merge pull request #2373 from rust-lang/tshepang-patch-2
83dd0c7 
avoid duplicating commands
Merge from rustc
249c62a
@tshepang
Merge pull request #2388 from rust-lang/rustc-pull
2fc03df 
Rustc pull update
Merge from rustc
446441c
@tshepang
Merge pull request #2437 from rust-lang/rustc-pull
810e944 
Rustc pull update
@tshepang
Merge pull request #2435 from smanilov/patch-19
840a060 
Add opaque type attributes
@tshepang
Merge pull request #2386 from Lysxia/fix-link
840436a 
Fix link to GatherBorrows
Merge from rustc
736eed6
@tshepang
Merge pull request #2461 from rust-lang/rustc-pull
6890bfc 
Rustc pull update
Merge from rustc
b22e611
@tshepang
Merge pull request #2464 from rust-lang/rustc-pull
4df7ab9 
Rustc pull update
@tshepang
Merge pull request #2441 from rust-lang/tshepang-remove-title-case
ef9cf9e 
use consistent title capitalization
Merge from rustc
5f3fc92
@tshepang
Merge pull request #2477 from rust-lang/rustc-pull
0d5edb1 
Rustc pull update
Merge from rustc
32fa3f5
@tshepang
Merge pull request #2479 from rust-lang/rustc-pull
ef1895f 
Rustc pull update
@Kobzol
Merge ref 'c96a69059ecc' from rust-lang/rust
3127337 
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: c96a690
Filtered ref: 7b9552d4c39c31aabf6749629da2d4a7e6e1cd60

This merge was created using https://github.com/rust-lang/josh-sync.
@jieyouxu
Merge pull request #2489 from Kobzol/pull
4c4a25d
@lnicola
Copy link
Member

lnicola commented Jul 28, 2025 •
edited
Loading

Hmm, the workflow still didn't run, not sure why.

@Veykril
Copy link
Member

Veykril commented Jul 28, 2025

Workflows do not get triggered by bot commits

@lnicola lnicola enabled auto-merge July 28, 2025 07:40
@lnicola lnicola disabled auto-merge July 28, 2025 07:40
@Veykril
Copy link
Member

Veykril commented Jul 28, 2025

I remember having the same issue with releaes-plz on salsa, though I noted down my findings but I can't find the relevant links anymore

@lnicola
Copy link
Member

lnicola commented Jul 28, 2025 •
edited
Loading

Wait, really? Then how are we supposed to merge this? And how can we tell that CI would fail because of a breaking change to rustc_abi?

@Veykril
Copy link
Member

Veykril commented Jul 28, 2025

Yea that's the issue, these setups are incompatible with merge queues 🙃 The only proper fix I think is having the bot author the final commit by a non-bot iirc.

@Veykril
Copy link
Member

Veykril commented Jul 28, 2025 •
edited
Loading

Related peter-evans/create-pull-request#48
https://help.github.com/en/articles/events-that-trigger-workflows#example-using-more-than-one-event

An action in a workflow run can't trigger a new workflow run. For example, if an action pushes code using the repository's GITHUB_TOKEN, a new workflow will not run even when the repository contains a workflow configured to run when push events occur.

@lnicola
Copy link
Member

lnicola commented Jul 28, 2025

CC @Kobzol can you take a look at this (and peter-evans/create-pull-request#48 (comment) in particular)?

@Kobzol
Copy link
Member

Kobzol commented Jul 28, 2025

Sorryy, I forgot to send a follow-up PR. We can solve this with triagebot. I'll send it when I'm at a PC.

@Kobzol Kobzol mentioned this pull request Jul 28, 2025
Merged
@Kobzol
Copy link
Member

Kobzol commented Jul 28, 2025

Here it is: #20330

@Kobzol
Copy link
Member

Kobzol commented Jul 28, 2025

To unblock this specific PR, just close and reopen it.

@lnicola lnicola closed this Jul 28, 2025
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2025
@lnicola lnicola reopened this Jul 28, 2025
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2025
@Kobzol
Copy link
Member

Kobzol commented Jul 28, 2025

Btw I'm not sure why triagebot flagged this PR, it should already be configured properly 🤔 (https://github.com/rust-analyzer/rust-analyzer/blob/ffeb325e09d9b5f2450f10cde8592ef8ffe2b922/triagebot.toml#L20)

@lnicola
Copy link
Member

lnicola commented Jul 28, 2025

To unblock this specific PR, just close and reopen it.

Thanks, I hate it 😀.

Btw I'm not sure why triagebot flagged this PR, it should already be configured properly

It was configured after this PR was filed.

@lnicola lnicola enabled auto-merge July 28, 2025 17:33
@Kobzol
Copy link
Member

Kobzol commented Jul 28, 2025

Thanks, I hate it 😀.

Yeah, it's not ideal 🙈 For next PRs, triagebot will autoclose/autoopen for you. We're working on switching the CI token to a GitHub app, that should allow running CI automatically without this hack.

@lnicola lnicola added this pull request to the merge queue Jul 28, 2025
@lnicola
Copy link
Member

lnicola commented Jul 28, 2025

Just asking, did you see the workaround of using another token with the repo scope? I'm not sure about the security implications though.

Merged via the queue into master with commit 511c999 Jul 28, 2025
15 checks passed
@lnicola lnicola deleted the rustc-pull branch July 28, 2025 17:54
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2025
@Kobzol
Copy link
Member

Kobzol commented Jul 28, 2025

We can use a personal token, which we did historically, but we want to move away from that. GH apps should be the way to go.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.