Skip to content
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

[stable] backport lint-docs fix #115083

Merged
merged 2 commits into from Aug 22, 2023
Merged

[stable] backport lint-docs fix #115083

merged 2 commits into from Aug 22, 2023

Conversation

Mark-Simulacrum
Copy link
Member

@jyn514 @Mark-Simulacrum
Revert "Fix x test lint-docs when download-rustc is enabled"
7cc7c5f 
This was not the correct fix. The problem was two-fold:
- `download-rustc` didn't respect `llvm.assertions`
- `rust-dev` was missing a bump to `download-ci-llvm-stamp`

The first is fixed in this PR and the latter was fixed a while ago. Revert this change to avoid breaking `rpath = false`.
@rustbot
Copy link
Collaborator

rustbot commented Aug 22, 2023

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. Please double check that you specified the right target!

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 22, 2023
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Aug 22, 2023

📌 Commit 7cc7c5f has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 22, 2023
@Mark-Simulacrum
Copy link
Member Author

@bors p=50

@rustbot rustbot added the T-release Relevant to the release subteam, which will review and decide on the PR/issue. label Aug 22, 2023
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never p=50

@bors
Copy link
Contributor

bors commented Aug 22, 2023

📌 Commit 4401331 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Aug 22, 2023

⌛ Testing commit 4401331 with merge f155f8c...

@bors
Copy link
Contributor

bors commented Aug 22, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing f155f8c to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 22, 2023
@bors bors merged commit f155f8c into rust-lang:stable Aug 22, 2023
12 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Aug 22, 2023
@Mark-Simulacrum Mark-Simulacrum deleted the stable-next branch August 22, 2023 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Mark-Simulacrum @rustbot @bors @jyn514