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

handle cygwin environment in install::sanitize_sh #134023

Merged
merged 2 commits into from
Dec 10, 2024
Merged

handle cygwin environment in install::sanitize_sh #134023

merged 2 commits into from
Dec 10, 2024
+19 −12

Conversation

onur-ozkan
Copy link
Member

Resolves #132507

@rustbot
Copy link
Collaborator

rustbot commented Dec 8, 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 Dec 8, 2024
@onur-ozkan onur-ozkan mentioned this pull request Dec 8, 2024
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Dec 8, 2024

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 changed the title detect and handle cygwin in install::sanitize_sh handle cygwin environment in install::sanitize_sh Dec 8, 2024
jieyouxu
jieyouxu approved these changes Dec 8, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks. I don't have access to a cygwin environment, but it was already broken on cygwin before and this can't make it worse even if it didn't work. On the contrary, I also think this might correctly address the reported issue. As such, there's only one way to find out if it works or not, and that is by merging it.

@jieyouxu
Copy link
Member

jieyouxu commented Dec 8, 2024

r? jieyouxu @bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Dec 8, 2024

📌 Commit d3b5340 has been approved by jieyouxu

It is now in the queue for this repository.

@rustbot rustbot assigned jieyouxu and unassigned albertlarsan68 Dec 8, 2024
@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 Dec 8, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Dec 8, 2024

@bors rollup (i dont think x install is exercised in ci)

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 9, 2024
@GuillaumeGomez
Rollup merge of rust-lang#134023 - onur-ozkan:132507, r=jieyouxu
5240cc1 
handle cygwin environment in `install::sanitize_sh`

Resolves rust-lang#132507
@GuillaumeGomez GuillaumeGomez mentioned this pull request Dec 9, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 9, 2024
@bors
Auto merge of rust-lang#134057 - GuillaumeGomez:rollup-kzesbgh, r=Gui…
1da727e 
…llaumeGomez

Rollup of 9 pull requests

Successful merges:

 - rust-lang#133184 (wasi/fs: Improve stopping condition for <ReadDir as Iterator>::next)
 - rust-lang#133955 (Pass the arch rather than full target name to windows_registry::find_tool)
 - rust-lang#133967 ([AIX] Pass -bnoipath when adding rust upstream dynamic crates)
 - rust-lang#133970 ([AIX] Replace sa_sigaction with sa_union.__su_sigaction for AIX)
 - rust-lang#133980 ([AIX] Remove option "-n" from AIX "ln" command)
 - rust-lang#133996 (Move most tests for `-l` and `#[link(..)]` into `tests/ui/link-native-libs`)
 - rust-lang#134017 (Don't use `AsyncFnOnce::CallOnceFuture` bounds for signature deduction)
 - rust-lang#134023 (handle cygwin environment in `install::sanitize_sh`)
 - rust-lang#134053 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 10))

r? `@ghost`
`@rustbot` modify labels: rollup
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Dec 9, 2024
@jieyouxu
Rollup merge of rust-lang#134023 - onur-ozkan:132507, r=jieyouxu
6de5012 
handle cygwin environment in `install::sanitize_sh`

Resolves rust-lang#132507
@jieyouxu jieyouxu mentioned this pull request Dec 9, 2024
Closed
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Dec 9, 2024
@jieyouxu
Rollup merge of rust-lang#134023 - onur-ozkan:132507, r=jieyouxu
ac3a4a9 
handle cygwin environment in `install::sanitize_sh`

Resolves rust-lang#132507
@jieyouxu jieyouxu mentioned this pull request Dec 9, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 9, 2024
@bors
Auto merge of rust-lang#134068 - jieyouxu:rollup-wv3b24c, r=jieyouxu
39e097b 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#133184 (wasi/fs: Improve stopping condition for <ReadDir as Iterator>::next)
 - rust-lang#133967 ([AIX] Pass -bnoipath when adding rust upstream dynamic crates)
 - rust-lang#133970 ([AIX] Replace sa_sigaction with sa_union.__su_sigaction for AIX)
 - rust-lang#133980 ([AIX] Remove option "-n" from AIX "ln" command)
 - rust-lang#133996 (Move most tests for `-l` and `#[link(..)]` into `tests/ui/link-native-libs`)
 - rust-lang#134017 (Don't use `AsyncFnOnce::CallOnceFuture` bounds for signature deduction)
 - rust-lang#134023 (handle cygwin environment in `install::sanitize_sh`)
 - rust-lang#134053 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 10))

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 9, 2024
@bors
Auto merge of rust-lang#134068 - jieyouxu:rollup-wv3b24c, r=jieyouxu
070f378 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#133184 (wasi/fs: Improve stopping condition for <ReadDir as Iterator>::next)
 - rust-lang#133967 ([AIX] Pass -bnoipath when adding rust upstream dynamic crates)
 - rust-lang#133970 ([AIX] Replace sa_sigaction with sa_union.__su_sigaction for AIX)
 - rust-lang#133980 ([AIX] Remove option "-n" from AIX "ln" command)
 - rust-lang#133996 (Move most tests for `-l` and `#[link(..)]` into `tests/ui/link-native-libs`)
 - rust-lang#134017 (Don't use `AsyncFnOnce::CallOnceFuture` bounds for signature deduction)
 - rust-lang#134023 (handle cygwin environment in `install::sanitize_sh`)
 - rust-lang#134053 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 10))

r? `@ghost`
`@rustbot` modify labels: rollup
fmease added a commit to fmease/rust that referenced this pull request Dec 9, 2024
@fmease
Rollup merge of rust-lang#134023 - onur-ozkan:132507, r=jieyouxu
6cf11ac 
handle cygwin environment in `install::sanitize_sh`

Resolves rust-lang#132507
@fmease fmease mentioned this pull request Dec 9, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2024
@bors
Auto merge of rust-lang#134097 - fmease:rollup-e6kszfd, r=fmease
dee520e 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#133967 ([AIX] Pass -bnoipath when adding rust upstream dynamic crates)
 - rust-lang#133970 ([AIX] Replace sa_sigaction with sa_union.__su_sigaction for AIX)
 - rust-lang#133980 ([AIX] Remove option "-n" from AIX "ln" command)
 - rust-lang#134008 (Make `Copy` unsafe to implement for ADTs with `unsafe` fields)
 - rust-lang#134017 (Don't use `AsyncFnOnce::CallOnceFuture` bounds for signature deduction)
 - rust-lang#134023 (handle cygwin environment in `install::sanitize_sh`)
 - rust-lang#134041 (Use SourceMap to load debugger visualizer files)
 - rust-lang#134065 (Move `write_graphviz_results`)
 - rust-lang#134070 (Some asm! diagnostic adjustments and a papercut fix)

r? `@ghost`
`@rustbot` modify labels: rollup
fmease added a commit to fmease/rust that referenced this pull request Dec 10, 2024
@fmease
Rollup merge of rust-lang#134023 - onur-ozkan:132507, r=jieyouxu
92d51e9 
handle cygwin environment in `install::sanitize_sh`

Resolves rust-lang#132507
This was referenced Dec 10, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2024
@bors
Auto merge of rust-lang#134125 - fmease:rollup-u38o3ob, r=fmease
33c245b 
Rollup of 11 pull requests

Successful merges:

 - rust-lang#133478 (jsondocck: Parse, don't validate commands.)
 - rust-lang#133967 ([AIX] Pass -bnoipath when adding rust upstream dynamic crates)
 - rust-lang#133970 ([AIX] Replace sa_sigaction with sa_union.__su_sigaction for AIX)
 - rust-lang#133980 ([AIX] Remove option "-n" from AIX "ln" command)
 - rust-lang#134008 (Make `Copy` unsafe to implement for ADTs with `unsafe` fields)
 - rust-lang#134017 (Don't use `AsyncFnOnce::CallOnceFuture` bounds for signature deduction)
 - rust-lang#134023 (handle cygwin environment in `install::sanitize_sh`)
 - rust-lang#134041 (Use SourceMap to load debugger visualizer files)
 - rust-lang#134065 (Move `write_graphviz_results`)
 - rust-lang#134106 (Add compiler-maintainers who requested to be on review rotation)
 - rust-lang#134123 (bootstrap: Forward cargo JSON output to stdout, not stderr)

Failed merges:

 - rust-lang#134120 (Remove Felix from ping groups and review rotation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8e9953f into rust-lang:master Dec 10, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 10, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2024
@rust-timer
Unrolled build for rust-lang#134023
8bcd12e 
Rollup merge of rust-lang#134023 - onur-ozkan:132507, r=jieyouxu

handle cygwin environment in `install::sanitize_sh`

Resolves rust-lang#132507
@onur-ozkan onur-ozkan deleted the 132507 branch December 10, 2024 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

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

Successfully merging this pull request may close these issues.

install::sanitize_sh(Path) breaks paths in Windows 10
6 participants
@onur-ozkan @rustbot @rust-log-analyzer @jieyouxu @bors @albertlarsan68