-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Remove some msys2 utils #126343
Remove some msys2 utils #126343
Conversation
This all passed CI successfully https://github.com/rust-lang/rust/actions/runs/9487209384?pr=126343 One other thing that occurs to me is that the mingw builders use their own vendored msys2. Therefore this setup is entirely redundant. I'll try removing the msys2 action entirely and see which jobs fail. I would still expect msvc build to fail because |
Actually, thinking about it some more, I'd be a bit surprised if github CI didn't have |
62e6dbd
to
48d3425
Compare
Ok, that didn't work. Seems that, even for mingw builds, we do need to install msys2 So I've reverted to the original of only adding the tools we actually need. This should be ready for now review. Oh, I forgot to mark this as draft/waiting on author... oops. So erm @Kobzol. |
@bors try |
Remove some msys2 utils `dos2unix` should no longer be necessary. I suspect `diffutils` might not be needed either as (I think) only `diff` is used and that seems to be shipped with git bash at least. try-job: x86_64-msvc try-job: x86_64-msvc-ext try-job: dist-x86_64-msvc
☀️ Try build successful - checks-actions |
The try build has succeeded, so it looks ok. @bors r+ |
Remove some msys2 utils `dos2unix` should no longer be necessary. I suspect `diffutils` might not be needed either as (I think) only `diff` is used and that seems to be shipped with git bash at least. try-job: x86_64-msvc try-job: x86_64-msvc-ext try-job: dist-x86_64-msvc
The errors look like |
Ah. makes sense. I think sticking with this setup for now is the easiest to maintain. Or at least requires the fewest lines of custom bash code. It will be interesting to revisit this once the run-make tests are fully ported to rust. |
The last time I forgot to install make on a new machine or MSYS2 reinstall, I didn't notice it until trying to run run-make tests. |
There is still this, for some reason 😆 I'd like to remove this Makefile finally. |
Oh, that's weird. I didn't even know that existed. It didn't seem to fail in the jobs I checked though. |
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#121216 (Always emit `native-static-libs` note, even if it is empty) - rust-lang#122613 (Don't build a broken/untested profiler runtime on mingw targets) - rust-lang#123962 (change method resolution to constrain hidden types instead of rejecting method candidates) - rust-lang#126320 (Avoid ICES after reporting errors on erroneous patterns) - rust-lang#126343 (Remove some msys2 utils) - rust-lang#126351 (std::unix::fs::link using direct linkat call for Solaris.) - rust-lang#126399 (extend the check for LLVM build) Failed merges: - rust-lang#126388 (const-eval: make lint scope computation consistent) r? `@ghost` `@rustbot` modify labels: rollup
I was thinking more about other tools like rust-analyzer, they have quite a dependency tree. I feel rustc is more cautious in this regard. |
Remove some msys2 utils `dos2unix` should no longer be necessary. I suspect `diffutils` might not be needed either as (I think) only `diff` is used and that seems to be shipped with git bash at least. try-job: x86_64-msvc try-job: x86_64-msvc-ext try-job: dist-x86_64-msvc
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#121216 (Always emit `native-static-libs` note, even if it is empty) - rust-lang#123962 (change method resolution to constrain hidden types instead of rejecting method candidates) - rust-lang#126285 (`UniqueRc`: support allocators and `T: ?Sized`.) - rust-lang#126315 (Add pub struct with allow(dead_code) into worklist) - rust-lang#126320 (Avoid ICES after reporting errors on erroneous patterns) - rust-lang#126343 (Remove some msys2 utils) - rust-lang#126351 (std::unix::fs::link using direct linkat call for Solaris.) - rust-lang#126399 (extend the check for LLVM build) r? `@ghost` `@rustbot` modify labels: rollup
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#121216 (Always emit `native-static-libs` note, even if it is empty) - rust-lang#123962 (change method resolution to constrain hidden types instead of rejecting method candidates) - rust-lang#126285 (`UniqueRc`: support allocators and `T: ?Sized`.) - rust-lang#126315 (Add pub struct with allow(dead_code) into worklist) - rust-lang#126320 (Avoid ICES after reporting errors on erroneous patterns) - rust-lang#126343 (Remove some msys2 utils) - rust-lang#126351 (std::unix::fs::link using direct linkat call for Solaris.) - rust-lang#126399 (extend the check for LLVM build) r? `@ghost` `@rustbot` modify labels: rollup
Remove some msys2 utils `dos2unix` should no longer be necessary. I suspect `diffutils` might not be needed either as (I think) only `diff` is used and that seems to be shipped with git bash at least. try-job: x86_64-msvc try-job: x86_64-msvc-ext try-job: dist-x86_64-msvc
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#121216 (Always emit `native-static-libs` note, even if it is empty) - rust-lang#123962 (change method resolution to constrain hidden types instead of rejecting method candidates) - rust-lang#126285 (`UniqueRc`: support allocators and `T: ?Sized`.) - rust-lang#126315 (Add pub struct with allow(dead_code) into worklist) - rust-lang#126320 (Avoid ICES after reporting errors on erroneous patterns) - rust-lang#126343 (Remove some msys2 utils) - rust-lang#126351 (std::unix::fs::link using direct linkat call for Solaris.) - rust-lang#126399 (extend the check for LLVM build) - rust-lang#126436 (Reduce rustdoc GUI tests flakyness) r? `@ghost` `@rustbot` modify labels: rollup
Remove some msys2 utils `dos2unix` should no longer be necessary. I suspect `diffutils` might not be needed either as (I think) only `diff` is used and that seems to be shipped with git bash at least. try-job: x86_64-msvc try-job: x86_64-msvc-ext try-job: dist-x86_64-msvc
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#121216 (Always emit `native-static-libs` note, even if it is empty) - rust-lang#123962 (change method resolution to constrain hidden types instead of rejecting method candidates) - rust-lang#126285 (`UniqueRc`: support allocators and `T: ?Sized`.) - rust-lang#126315 (Add pub struct with allow(dead_code) into worklist) - rust-lang#126320 (Avoid ICES after reporting errors on erroneous patterns) - rust-lang#126343 (Remove some msys2 utils) - rust-lang#126351 (std::unix::fs::link using direct linkat call for Solaris.) - rust-lang#126399 (extend the check for LLVM build) r? `@ghost` `@rustbot` modify labels: rollup
Remove some msys2 utils `dos2unix` should no longer be necessary. I suspect `diffutils` might not be needed either as (I think) only `diff` is used and that seems to be shipped with git bash at least. try-job: x86_64-msvc try-job: x86_64-msvc-ext try-job: dist-x86_64-msvc
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#123962 (change method resolution to constrain hidden types instead of rejecting method candidates) - rust-lang#124884 (place explicit lifetime bound after generic param) - rust-lang#126244 (Update fuchsia commit, and SDK to 21.20240610.2.1) - rust-lang#126270 (Migrate run make const fn mir) - rust-lang#126320 (Avoid ICES after reporting errors on erroneous patterns) - rust-lang#126343 (Remove some msys2 utils) - rust-lang#126351 (std::unix::fs::link using direct linkat call for Solaris.) - rust-lang#126368 (Remove some unnecessary crate dependencies.) - rust-lang#126386 (Migrate `run-make/allow-non-lint-warnings-cmdline` to `rmake.rs`) - rust-lang#126449 (Fill out missing Windows support information) r? `@ghost` `@rustbot` modify labels: rollup
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#124884 (place explicit lifetime bound after generic param) - rust-lang#126343 (Remove some msys2 utils) - rust-lang#126351 (std::unix::fs::link using direct linkat call for Solaris.) - rust-lang#126368 (Remove some unnecessary crate dependencies.) - rust-lang#126386 (Migrate `run-make/allow-non-lint-warnings-cmdline` to `rmake.rs`) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#126343 - ChrisDenton:remove-utils, r=Kobzol Remove some msys2 utils `dos2unix` should no longer be necessary. I suspect `diffutils` might not be needed either as (I think) only `diff` is used and that seems to be shipped with git bash at least. try-job: x86_64-msvc try-job: x86_64-msvc-ext try-job: dist-x86_64-msvc
dos2unix
should no longer be necessary. I suspectdiffutils
might not be needed either as (I think) onlydiff
is used and that seems to be shipped with git bash at least.try-job: x86_64-msvc
try-job: x86_64-msvc-ext
try-job: dist-x86_64-msvc