Skip to content

Do not use git -C dir #146654

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
Merged
merged 1 commit into from
Sep 18, 2025
Merged

Do not use git -C dir #146654

merged 1 commit into from
Sep 18, 2025

Conversation

samueltardieu
Copy link
Member

@samueltardieu samueltardieu commented Sep 16, 2025 •
edited by rustbot
Loading

Older versions of git (≤ 1.8.5) do not support the -C dir global option. Use the cwd optional argument when using Python's subprocess functionality instead.

Fix #142534

@samueltardieu
Do not use git -C dir
b79a4bf 
Older versions of git (≤ 1.8.5) do not support the `-C dir` global
option. Use the `cwd` optional argument when using Python's
`subprocess` functionality instead.
@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 16, 2025
@rustbot
Copy link
Collaborator

rustbot commented Sep 16, 2025

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

@samueltardieu
Copy link
Member Author

(disclaimer: fix is untested, as right now I can't seem to build bootstrap on NixOS)

@samueltardieu samueltardieu mentioned this pull request Sep 16, 2025
Closed
@samueltardieu
Copy link
Member Author

Since this is where the problem was noticed, let's test @bors try jobs=dist-x86_64-linux

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors bot added a commit that referenced this pull request Sep 16, 2025
@rust-bors
Auto merge of #146654 - samueltardieu:issue142534, r=<try>
bb3dbbe 
Do not use `git -C dir`

try-job: dist-x86_64-linux
@samueltardieu
Copy link
Member Author

Oh, it looks like this would hog the problematic runner, let's not do this @bors try cancel

@rust-bors
Copy link

rust-bors bot commented Sep 16, 2025

Try build cancelled. Cancelled workflows:

@Kobzol
Copy link
Member

Kobzol commented Sep 16, 2025

What do you mean by "hog"? We should definitely do the try job to see if it worked or not :)

@Kobzol
Copy link
Member

Kobzol commented Sep 16, 2025

@bors try

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors bot added a commit that referenced this pull request Sep 16, 2025
@rust-bors
Auto merge of #146654 - samueltardieu:issue142534, r=<try>
8a8b845 
Do not use `git -C dir`
@samueltardieu
Copy link
Member Author

What do you mean by "hog"? We should definitely do the try job to see if it worked or not :)

Since it was waiting for a runner when I checked the job that just started, and an old CentOS was used, I was afraid a real dedicated machine was used, and could run only one job at a time.

@Kobzol
Copy link
Member

Kobzol commented Sep 16, 2025

Ah, I see :) No, don't worry, we can run many try jobs in parallel.

@rust-bors
Copy link

rust-bors bot commented Sep 16, 2025

☀️ Try build successful (CI)
Build commit: 8a8b845 (8a8b8458c58de44392a164f60421c92b8f3b2ca5, parent: eec6bd9d69832f57341c6de6a93fa7b9f47e2111)

@Kobzol
Copy link
Member

Kobzol commented Sep 17, 2025

Looks good, and this is a better solution overall anyway. Thank you!

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Sep 17, 2025

📌 Commit b79a4bf 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 Sep 17, 2025
@jdonszelmann jdonszelmann mentioned this pull request Sep 17, 2025
Merged
bors added a commit that referenced this pull request Sep 17, 2025
@bors
Auto merge of #146685 - jdonszelmann:rollup-kwuih4z, r=jdonszelmann
9311767 
Rollup of 7 pull requests

Successful merges:

 - #146458 (Add parallel-frontend-threads to bootstrap.toml and enable multi-threaded parallel compilation)
 - #146485 (Remove unsized arg handling in `ArgAbiBuilderMethods::store_fn_arg` implementations)
 - #146536 (clean up several trait related UI tests)
 - #146598 (Make llvm_enzyme a regular cargo feature)
 - #146647 (Move `#[rustc_coherence_is_core]` to the `crate_level` file)
 - #146654 (Do not use `git -C dir`)
 - #146681 (Add space after brace in `Box<[T]>::new_uninit_slice` example)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b8a80e4 into rust-lang:master Sep 18, 2025
11 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Sep 18, 2025
rust-timer added a commit that referenced this pull request Sep 18, 2025
@rust-timer
Unrolled build for #146654
5beda5d 
Rollup merge of #146654 - samueltardieu:issue142534, r=Kobzol

Do not use `git -C dir`

Older versions of git (≤ 1.8.5) do not support the `-C dir` global option. Use the `cwd` optional argument when using Python's `subprocess` functionality instead.

Fix #142534
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-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.92.0
Development

Successfully merging this pull request may close these issues.

ci: git Unknown option: -C
4 participants
@samueltardieu @rustbot @Kobzol @bors