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.

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

unify git command preperation #126309

Merged
merged 1 commit into from
Jun 16, 2024
Merged

Conversation

onur-ozkan
Copy link
Member

Due to #125954, we had to modify git invocations with certain flags in #126255. However, because there are so many instances of Command::new("git") in bootstrap, it is difficult to apply these solutions to all of them.

This PR creates a helper function that unifies the git usage in bootstrap. Meaning, whenever special flags or hacks are needed, we can apply them to this single function which makes things much simpler for the bootstrap team.

@rustbot
Copy link
Collaborator

rustbot commented Jun 12, 2024

r? @albertlarsan68

rustbot has assigned @albertlarsan68.
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 12, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 12, 2024

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@onur-ozkan onur-ozkan force-pushed the unify-git-utilization branch 2 times, most recently from a74d1d5 to 17a7ab7 Compare June 12, 2024 09:16
Due to rust-lang#125954, we had to modify git invocations with
certain flags in rust-lang#126255. However, because there are so many
instances of `Command::new("git")` in bootstrap, it is difficult to apply these solutions to all of
them.

This PR creates a helper function that unifies the git usage in bootstrap. Meaning, whenever special flags
or hacks are needed, we can apply them to this single function which makes things much simpler for the bootstrap team.

Signed-off-by: onur-ozkan <[email protected]>
@Kobzol
Copy link
Contributor

Kobzol commented Jun 15, 2024

r? @Kobzol

@rustbot rustbot assigned Kobzol and unassigned albertlarsan68 Jun 15, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Jun 15, 2024

Went through the usages, everything seems to be the same as before, just going through the wrapper 👍 I'll try to build a git helper wrapper on top of this that could cache some of the git invocations, to help with this.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 15, 2024

📌 Commit 17a7ab7 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 15, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 16, 2024
Rollup of 4 pull requests

Successful merges:

 - rust-lang#125112 (Document behavior of `create_dir_all` wrt. empty path)
 - rust-lang#126127 (Spell out other trait diagnostic)
 - rust-lang#126309 (unify git command preperation)
 - rust-lang#126539 (Update `Arc::try_unwrap()` docs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e345ddb into rust-lang:master Jun 16, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 16, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 16, 2024
Rollup merge of rust-lang#126309 - onur-ozkan:unify-git-utilization, r=Kobzol

unify git command preperation

Due to rust-lang#125954, we had to modify git invocations with certain flags in rust-lang#126255. However, because there are so many instances of `Command::new("git")` in bootstrap, it is difficult to apply these solutions to all of them.

This PR creates a helper function that unifies the git usage in bootstrap. Meaning, whenever special flags or hacks are needed, we can apply them to this single function which makes things much simpler for the bootstrap team.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants