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

make cargo submodule optional #126470

Merged
merged 5 commits into from
Jun 28, 2024
Merged

make cargo submodule optional #126470

merged 5 commits into from
Jun 28, 2024

Conversation

onur-ozkan
Copy link
Member

Right now, we fetch the cargo submodule no matter what, even if the command we are running doesn't need it (e.g., x build compiler library). This PR changes that to only fetch the cargo submodule when it's necessary.

For more context, see the zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/Why.20is.20cargo.20always.20checked.20out.3F

@rustbot
Copy link
Collaborator

rustbot commented Jun 14, 2024

r? @clubby789

rustbot has assigned @clubby789.
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 Jun 14, 2024
@onur-ozkan
Copy link
Member Author

I will wait until #126230 is merged so I don't need to duplicate the tidy part.

@onur-ozkan onur-ozkan added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 14, 2024
ehuss
ehuss reviewed Jun 14, 2024
View reviewed changes
Copy link
Contributor

@ehuss ehuss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the doc comment for workspace_members should be updated.

I think the checkout is also needed in tool::Cargo, otherwise commands like ./x.py test src/tools cargo or ./x.py build src/tools/cargo will fail.

It will also need to be added to the vendor command to support ./x.py vendor.

@onur-ozkan
bootstrap: exclude cargo from package metadata
11acf83 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
don't fetch/sync cargo submodule by default
457ac5d 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
refactor tool_doc macro in bootstrap
8c3ebf7 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
handle cargo submodule in a lazy-load way
51f6e68 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Member Author

Rebased.

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jun 24, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Jun 27, 2024

r? @Kobzol

@rustbot rustbot assigned Kobzol and unassigned clubby789 Jun 27, 2024
Kobzol
Kobzol reviewed Jun 27, 2024
View reviewed changes
Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried all commands that I could think of and everything seemed to work.

src/bootstrap/src/core/metadata.rs Outdated Show resolved Hide resolved
src/bootstrap/src/core/build_steps/doc.rs Show resolved Hide resolved
@Kobzol
Copy link
Contributor

Kobzol commented Jun 27, 2024

Ok, looks good! It's possible that we have missed something, but the main commands all seem to work, so hopefully it should be fine (if not, we know what to do, sprinkle cargo checkout on more places).

Feel free to r=me once CI is green.

@onur-ozkan
remove unnecessary packages from metadata::workspace_members
3457ecc 
Currently bootstrap doesn't use any inner paths from rust-analyzer and
bootstrap with `ShouldRun::create_or_deps`.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Member Author

@bors r=Kobzol

@bors
Copy link
Contributor

bors commented Jun 27, 2024

📌 Commit 3457ecc has been approved by Kobzol

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 Jun 27, 2024
jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 28, 2024
@jhpratt
Rollup merge of rust-lang#126470 - onur-ozkan:optional-cargo-submodul…
5c5b50e 
…e, r=Kobzol

make cargo submodule optional

Right now, we fetch the cargo submodule no matter what, even if the command we are running doesn't need it (e.g., `x build compiler library`). This PR changes that to only fetch the cargo submodule when it's necessary.

For more context, see the zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/Why.20is.20cargo.20always.20checked.20out.3F
@jhpratt jhpratt mentioned this pull request Jun 28, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 28, 2024
@matthiaskrgr
Rollup merge of rust-lang#126470 - onur-ozkan:optional-cargo-submodul…
b08a0cf 
…e, r=Kobzol

make cargo submodule optional

Right now, we fetch the cargo submodule no matter what, even if the command we are running doesn't need it (e.g., `x build compiler library`). This PR changes that to only fetch the cargo submodule when it's necessary.

For more context, see the zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/Why.20is.20cargo.20always.20checked.20out.3F
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 28, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 28, 2024
@matthiaskrgr
Rollup merge of rust-lang#126470 - onur-ozkan:optional-cargo-submodul…
6909cde 
…e, r=Kobzol

make cargo submodule optional

Right now, we fetch the cargo submodule no matter what, even if the command we are running doesn't need it (e.g., `x build compiler library`). This PR changes that to only fetch the cargo submodule when it's necessary.

For more context, see the zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/Why.20is.20cargo.20always.20checked.20out.3F
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 28, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 28, 2024
@bors
Auto merge of rust-lang#127067 - matthiaskrgr:rollup-85ecygb, r=matth…
b4e75bd 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#124741 (patchable-function-entry: Add unstable compiler flag and attribute)
 - rust-lang#126470 (make cargo submodule optional)
 - rust-lang#126701 (ignore `llvm::Lld` if lld is not enabled)
 - rust-lang#126956 (core: avoid `extern type`s in formatting infrastructure)
 - rust-lang#126970 (Simplify `str::clone_into`)
 - rust-lang#127058 (Tighten `fn_decl_span` for async blocks)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 28, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 28, 2024
@bors
Auto merge of rust-lang#127076 - matthiaskrgr:rollup-l01gm36, r=matth…
99f77a2 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#124741 (patchable-function-entry: Add unstable compiler flag and attribute)
 - rust-lang#126470 (make cargo submodule optional)
 - rust-lang#126956 (core: avoid `extern type`s in formatting infrastructure)
 - rust-lang#126970 (Simplify `str::clone_into`)
 - rust-lang#127022 (Support fetching `Attribute` of items.)
 - rust-lang#127058 (Tighten `fn_decl_span` for async blocks)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d5ab931 into rust-lang:master Jun 28, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 28, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 28, 2024
@rust-timer
Unrolled build for rust-lang#126470
29555f5 
Rollup merge of rust-lang#126470 - onur-ozkan:optional-cargo-submodule, r=Kobzol

make cargo submodule optional

Right now, we fetch the cargo submodule no matter what, even if the command we are running doesn't need it (e.g., `x build compiler library`). This PR changes that to only fetch the cargo submodule when it's necessary.

For more context, see the zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/Why.20is.20cargo.20always.20checked.20out.3F
@onur-ozkan onur-ozkan deleted the optional-cargo-submodule branch June 28, 2024 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehuss ehuss ehuss left review comments

@RalfJung RalfJung RalfJung left review comments

@Kobzol Kobzol Kobzol left review comments

Assignees

@Kobzol Kobzol

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.81.0
Development

Successfully merging this pull request may close these issues.
7 participants
@onur-ozkan @rustbot @Kobzol @bors @ehuss @RalfJung @clubby789