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

only call git on git checkouts during bootstrap #108963

Merged
merged 1 commit into from
Mar 10, 2023
Merged

only call git on git checkouts during bootstrap #108963

merged 1 commit into from
Mar 10, 2023

Conversation

jhheider
Copy link
Contributor

fixes #108959

@rustbot
Copy link
Collaborator

rustbot commented Mar 10, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @albertlarsan68 (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@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 Mar 10, 2023
@jhheider jhheider mentioned this pull request Mar 10, 2023
Merged
@jyn514
Copy link
Member

jyn514 commented Mar 10, 2023

cc #102428

@jhheider
Copy link
Contributor Author

cc #102428

Yes, I could see broader issues; this fix, at least, is narrowly tailored (and removes reliance on an assumption), hopefully simplifying acceptance.

But having rust detect its own CI versus CI in general will prevent other classes of possible issues.

@albertlarsan68
Copy link
Member

Seems good.
I've open a tracking issue in #108966 to continue the work done in this PR.

@albertlarsan68
Copy link
Member

Thanks for the PR!
@bors r+

@bors
Copy link
Contributor

bors commented Mar 10, 2023

📌 Commit 54e5c19 has been approved by albertlarsan68

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 Mar 10, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 10, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2023
@bors
Auto merge of rust-lang#108977 - matthiaskrgr:rollup-1bnl1hu, r=matth…
35a0961 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#108879 (Unconstrained terms should account for infer vars being equated)
 - rust-lang#108936 (Rustdoc: don't hide anonymous reexport)
 - rust-lang#108940 (Add myself to compiler reviewers list)
 - rust-lang#108945 (Make some report and emit errors take DefIds instead of BodyIds)
 - rust-lang#108946 (Document the resulting values produced when using `From<bool>` on floats)
 - rust-lang#108956 (Make ptr::from_ref and ptr::from_mut in rust-lang#106116 const.)
 - rust-lang#108960 (Remove `body_def_id` from `Inherited`)
 - rust-lang#108963 (only call git on git checkouts during bootstrap)
 - rust-lang#108964 (Fix the docs for pointer method with_metadata_of)

Failed merges:

 - rust-lang#108950 (Directly construct Inherited in typeck.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7918df5 into rust-lang:master Mar 10, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 10, 2023
@nikic nikic mentioned this pull request Mar 11, 2023
Merged
jhheider added a commit to pkgxdev/pantry that referenced this pull request Apr 20, 2023
@jhheider
fix(rust)
73d853d 
rust-lang/rust#108963
jhheider added a commit to pkgxdev/pantry that referenced this pull request Apr 20, 2023
@jhheider
fix(rust)
4167b19 
rust-lang/rust#108963
@jhheider jhheider mentioned this pull request Apr 20, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@albertlarsan68 albertlarsan68

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.

rust bootstrap in CI failing for 1.68.0
5 participants
@jhheider @rustbot @jyn514 @albertlarsan68 @bors