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

don't remove bootstrap on stage0 bump #129924

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

don't remove bootstrap on stage0 bump #129924

wants to merge 1 commit into from
+0 −6

Conversation

onur-ozkan
Copy link
Member

#125578 is closed and this workaround should no longer be necessary.

@rustbot
Copy link
Collaborator

rustbot commented Sep 3, 2024

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Sep 3, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Sep 3, 2024

I tried this:

  1. Checkout https://github.com/rust-lang/rust/commit/2059132d3c715514da0e4f9cd395a708e666e306 (version before the latest beta bump)
  2. Remove the workaround
  3. ./x check
  4. Checkout https://github.com/rust-lang/rust/commit/6c199c89c72db4c1912674f872eabd34753b19f8 (latest beta bump)
  5. Remove the workaround
  6. ./x check

But still got the error :( Even though that bump should already have included #127050, if I'm not mistaken.

@onur-ozkan
Copy link
Member Author

I tried this:

  1. Checkout https://github.com/rust-lang/rust/commit/2059132d3c715514da0e4f9cd395a708e666e306 (version before the latest beta bump)
  2. Remove the workaround
  3. ./x check
  4. Checkout https://github.com/rust-lang/rust/commit/6c199c89c72db4c1912674f872eabd34753b19f8 (latest beta bump)
  5. Remove the workaround
  6. ./x check

But still got the error :( Even though that bump should already have included #127050, if I'm not mistaken.

I haven't tested it. In that case #125578 isn't really fixed and it should be re-opened?

@Kobzol
Copy link
Contributor

Kobzol commented Sep 4, 2024

Yes, seems like so.

@onur-ozkan onur-ozkan added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 7, 2024
@onur-ozkan
Copy link
Member Author

Let's keep this blocked then.

@onur-ozkan onur-ozkan mentioned this pull request Sep 7, 2024
Open
@bors
Copy link
Contributor

bors commented Sep 27, 2024

☔ The latest upstream changes (presumably #130934) made this pull request unmergeable. Please resolve the merge conflicts.

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

@Kobzol Kobzol

Labels
S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@onur-ozkan @rustbot @Kobzol @bors