Remove some msys2 utils by ChrisDenton · Pull Request #126343 · rust-lang/rust (original) (raw)

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 andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation15 Commits1 Checks6 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

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

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

rustbot added A-testsuite

Area: The testsuite used to check the correctness of rustc

S-waiting-on-review

Status: Awaiting review from the assignee but also interested parties.

T-infra

Relevant to the infrastructure team, which will review and decide on the PR/issue.

labels

Jun 12, 2024

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 make is currently still necessary for run-make tests.

Actually, thinking about it some more, I'd be a bit surprised if github CI didn't have make installed by default. So this might work for msvc even. Then again, it might have the wrong make, so we'll see.

ChrisDenton changed the title[DO NOT MERGE] Attempt to remove some msys2 utils Remove some msys2 utils

Jun 12, 2024

Ok, that didn't work. Seems that, even for mingw builds, we do need to install msys2 make for run-make tests.

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 added a commit to rust-lang-ci/rust that referenced this pull request

Jun 13, 2024

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
Build commit: 818e18d (818e18dde43bd7631b844d22b31f3755d21831ef)

The try build has succeeded, so it looks ok.

@bors r+

📌 Commit 48d3425 has been approved by Kobzol

It is now in the queue for this repository.

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 13, 2024

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request

Jun 13, 2024

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

Ok, that didn't work. Seems that, even for mingw builds, we do need to install msys2 make for run-make tests.

The errors look like win32-make was used which handles paths in a weird way. Probably can be made to work, but rewriting the tests might require less effort.
I don't think so (at least for rustc) but make might be still necessary to build C libs like openssl and so on.

Ok, that didn't work. Seems that, even for mingw builds, we do need to install msys2 make for run-make tests.

The errors look like win32-make was used which handles paths in a weird way. Probably can be made to work, but rewriting the tests might require less effort. I don't think so (at least for rustc) but make might be still necessary to build C libs like openssl and so on.

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.
That's probably a good sign, unless make is involved in building something on stage 2-3, like cargo.

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.

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jun 13, 2024

…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

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. That's probably a good sign, unless make is involved in building something on stage 2-3, like cargo.

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.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request

Jun 13, 2024

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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jun 13, 2024

…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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jun 13, 2024

…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

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request

Jun 13, 2024

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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jun 13, 2024

…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

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request

Jun 13, 2024

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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jun 13, 2024

…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

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request

Jun 14, 2024

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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jun 14, 2024

…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

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jun 14, 2024

…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

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request

Jun 14, 2024

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

Labels

A-testsuite

Area: The testsuite used to check the correctness of rustc

S-waiting-on-bors

Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

T-infra

Relevant to the infrastructure team, which will review and decide on the PR/issue.