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

run-make: Remove cygpath #128611

Merged
merged 1 commit into from
Aug 5, 2024
Merged

run-make: Remove cygpath #128611

merged 1 commit into from
Aug 5, 2024

Conversation

ChrisDenton
Copy link
Member

@ChrisDenton ChrisDenton commented Aug 3, 2024

Remove cygpath from run-make-support.

@rustbot
Copy link
Collaborator

rustbot commented Aug 3, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
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
Copy link
Collaborator

rustbot commented Aug 3, 2024

The run-make-support library was changed

cc @jieyouxu

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 3, 2024
@ChrisDenton
Copy link
Member Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 3, 2024
run-make: Only use cygpath if the path looks unixy

`cygpath -w` can mangle paths that are already Windows paths. Therefore only use it if the path looks like a Unix path. Additionally fallback to using the path as given if `cygpath` fails on the assumption that the path is already good or else will be an error when it's actually used.

Tbh, I'm not entirely convinced that `cygpath` is necessary but if it is used then it shouldn't get in the way of using Windows paths.

try-job: x86_64-msvc
try-job: i686-msvc
try-job: i686-mingw
try-job: x86_64-mingw
@bors
Copy link
Contributor

bors commented Aug 3, 2024

⌛ Trying commit 1ae5da1 with merge ab4ca48...

@ChrisDenton
Copy link
Member Author

For some reason bors is being unusually quiet so I'll do my best impression...

☀️ Try build successful - checks-actions
Build commit: ab4ca48 (ab4ca48edbacd5b21b81670c2ecb3bd4c7d36ade)

@ChrisDenton
Copy link
Member Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 3, 2024
run-make: Only use cygpath if the path looks unixy

`cygpath -w` can mangle paths that are already Windows paths. Therefore only use it if the path looks like a Unix path. Additionally fallback to using the path as given if `cygpath` fails on the assumption that the path is already good or else will be an error when it's actually used.

Tbh, I'm not entirely convinced that `cygpath` is necessary but if it is used then it shouldn't get in the way of using Windows paths.

try-job: x86_64-msvc
try-job: i686-msvc
try-job: i686-mingw
try-job: x86_64-mingw
@bors
Copy link
Contributor

bors commented Aug 3, 2024

⌛ Trying commit e861f93 with merge bbd0e9f...

@bors
Copy link
Contributor

bors commented Aug 4, 2024

☀️ Try build successful - checks-actions
Build commit: bbd0e9f (bbd0e9f9d3cd39f059a69b6ea65eb166a5092db1)

@ChrisDenton ChrisDenton changed the title run-make: Only use cygpath if the path looks unixy run-make: Remove cygpath Aug 4, 2024
@ChrisDenton
Copy link
Member Author

In light of the successful test, I've completely rewritten this PR to remove cypath entirely.

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.

Thank you! r=me once PR CI is green.

Good riddance!

@ChrisDenton
Copy link
Member Author

@bors r=jieyouxu

@bors
Copy link
Contributor

bors commented Aug 4, 2024

📌 Commit f9d7e4c has been approved by jieyouxu

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 Aug 4, 2024
ChrisDenton added a commit to ChrisDenton/rust that referenced this pull request Aug 5, 2024
run-make: Remove cygpath

Remove cygpath from run-make-support.
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 5, 2024
…enton

Rollup of 11 pull requests

Successful merges:

 - rust-lang#128026 (std::thread: available_parallelism implementation for vxWorks proposal.)
 - rust-lang#128471 (rustdoc: Fix handling of `Self` type in search index and refactor its representation)
 - rust-lang#128607 (Use `object` in `run-make/symbols-visibility`)
 - rust-lang#128609 (Remove unnecessary constants from flt2dec dragon)
 - rust-lang#128611 (run-make: Remove cygpath)
 - rust-lang#128630 (docs(resolve): more explain about `target`)
 - rust-lang#128638 (run-make: enable msvc for `link-dedup`)
 - rust-lang#128647 (Enable msvc for link-args-order)
 - rust-lang#128649 (run-make: Enable msvc for `no-duplicate-libs` and `zero-extend-abi-param-passing`)
 - rust-lang#128656 (Enable msvc for run-make/rust-lld)
 - rust-lang#128660 (tests: more crashes)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 5, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128026 (std::thread: available_parallelism implementation for vxWorks proposal.)
 - rust-lang#128471 (rustdoc: Fix handling of `Self` type in search index and refactor its representation)
 - rust-lang#128607 (Use `object` in `run-make/symbols-visibility`)
 - rust-lang#128609 (Remove unnecessary constants from flt2dec dragon)
 - rust-lang#128611 (run-make: Remove cygpath)
 - rust-lang#128619 (Correct the const stabilization of `<[T]>::last_chunk`)
 - rust-lang#128630 (docs(resolve): more explain about `target`)
 - rust-lang#128660 (tests: more crashes)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit baa00e5 into rust-lang:master Aug 5, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 5, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 5, 2024
Rollup merge of rust-lang#128611 - ChrisDenton:cygpath, r=jieyouxu

run-make: Remove cygpath

Remove cygpath from run-make-support.
@ChrisDenton ChrisDenton deleted the cygpath branch August 5, 2024 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants