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

Revert back to Git-for-Windows for MinGW CI builds #122125

Merged
merged 1 commit into from
Mar 10, 2024

Conversation

majaha
Copy link
Contributor

@majaha majaha commented Mar 7, 2024

Following discussion in #121182 it was decided to revert using MSYS2 Git for mingw builds.

In rust-lang#121182 the mingw build was
changed to use MSYS2's version of Git. This commit reverts that, as
it was considered too slow.
@rustbot
Copy link
Collaborator

rustbot commented Mar 7, 2024

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 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 Mar 7, 2024
@majaha
Copy link
Contributor Author

majaha commented Mar 7, 2024

r? @mati865

@rustbot
Copy link
Collaborator

rustbot commented Mar 7, 2024

Failed to set assignee to mati865: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

@Kobzol
Copy link
Contributor

Kobzol commented Mar 7, 2024

This doesn't revert the whole original PR, but only a part of it. Do we want to actually revert only these two lines?

r? @Mark-Simulacrum

@rustbot rustbot assigned Mark-Simulacrum and unassigned Kobzol Mar 7, 2024
@mati865
Copy link
Contributor

mati865 commented Mar 8, 2024

It fixes the biggest regression and adds prints to check how long it takes to delete the files.
I don’t think there’s any value in installing MSYS2 when its Git is gone (that's another potential point of failure), but I’ll leave that part to Mark.

@Mark-Simulacrum
Copy link
Member

🤷 I don't have any real opinion on that. I'm happy to avoid installing msys2 if we don't actually need it.

In the meantime I'll go ahead and approve this since it sounds like it should save some CI time in the meantime.

@bors r+

@bors
Copy link
Contributor

bors commented Mar 9, 2024

📌 Commit c7a48a5 has been approved by Mark-Simulacrum

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 Mar 9, 2024
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Mar 10, 2024
…crum

Revert back to Git-for-Windows for MinGW CI builds

Following discussion in rust-lang#121182 it was decided to revert using MSYS2 Git for mingw builds.
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2024
…kingjubilee

Rollup of 10 pull requests

Successful merges:

 - rust-lang#112136 (Add std::ffi::c_str module)
 - rust-lang#113525 (Dynamically size sigaltstk in std)
 - rust-lang#121561 (Detect typos for compiletest test directives)
 - rust-lang#121685 (Fixing shellcheck comments on lvi test script)
 - rust-lang#121833 (Suggest correct path in include_bytes!)
 - rust-lang#121860 (Add a tidy check that checks whether the fluent slugs only appear once)
 - rust-lang#122125 (Revert back to Git-for-Windows for MinGW CI builds)
 - rust-lang#122221 (match lowering: define a convenient struct)
 - rust-lang#122251 (Add test to check unused_lifetimes don't duplicate "parameter is never used" error)
 - rust-lang#122264 (add myself to rotation)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 10, 2024
…crum

Revert back to Git-for-Windows for MinGW CI builds

Following discussion in rust-lang#121182 it was decided to revert using MSYS2 Git for mingw builds.
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#112136 (Add std::ffi::c_str module)
 - rust-lang#113525 (Dynamically size sigaltstk in std)
 - rust-lang#121685 (Fixing shellcheck comments on lvi test script)
 - rust-lang#121833 (Suggest correct path in include_bytes!)
 - rust-lang#121860 (Add a tidy check that checks whether the fluent slugs only appear once)
 - rust-lang#122125 (Revert back to Git-for-Windows for MinGW CI builds)
 - rust-lang#122221 (match lowering: define a convenient struct)
 - rust-lang#122244 (fix: LocalWaker memory leak and some stability attributes)
 - rust-lang#122251 (Add test to check unused_lifetimes don't duplicate "parameter is never used" error)
 - rust-lang#122264 (add myself to rotation)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 10, 2024
…crum

Revert back to Git-for-Windows for MinGW CI builds

Following discussion in rust-lang#121182 it was decided to revert using MSYS2 Git for mingw builds.
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2024
…iaskrgr

Rollup of 14 pull requests

Successful merges:

 - rust-lang#112136 (Add std::ffi::c_str module)
 - rust-lang#113525 (Dynamically size sigaltstk in std)
 - rust-lang#121567 (Avoid some interning in bootstrap)
 - rust-lang#121642 (Update a test to support Symbol Mangling V0)
 - rust-lang#121685 (Fixing shellcheck comments on lvi test script)
 - rust-lang#121860 (Add a tidy check that checks whether the fluent slugs only appear once)
 - rust-lang#121942 (std::rand: enable getrandom for dragonflybsd too.)
 - rust-lang#122125 (Revert back to Git-for-Windows for MinGW CI builds)
 - rust-lang#122221 (match lowering: define a convenient struct)
 - rust-lang#122244 (fix: LocalWaker memory leak and some stability attributes)
 - rust-lang#122251 (Add test to check unused_lifetimes don't duplicate "parameter is never used" error)
 - rust-lang#122264 (add myself to rotation)
 - rust-lang#122269 (doc/rustc: Move loongarch64-unknown-linux-musl to Tier 3)
 - rust-lang#122271 (Fix legacy numeric constant diag items)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 44c8a6a into rust-lang:master Mar 10, 2024
11 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Mar 10, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2024
Rollup merge of rust-lang#122125 - majaha:mingw_ci_new, r=Mark-Simulacrum

Revert back to Git-for-Windows for MinGW CI builds

Following discussion in rust-lang#121182 it was decided to revert using MSYS2 Git for mingw builds.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants