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

Don't install msys2 in CI #136588

Merged
merged 1 commit into from
Feb 8, 2025
Merged

Don't install msys2 in CI #136588

merged 1 commit into from
Feb 8, 2025

Conversation

ChrisDenton
Copy link
Member

@ChrisDenton ChrisDenton commented Feb 5, 2025

windows-msvc doesn't need it and windows-gnu installs its own version

try-job: dist-x86_64-msvc
try-job: dist-i686-msvc
try-job: dist-aarch64-msvc
try-job: dist-i686-mingw
try-job: dist-x86_64-mingw
try-job: dist-x86_64-msvc-alt

windows-msvc doesn't need it and windows-gnu has its own version
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 5, 2025
@ChrisDenton
Copy link
Member Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 5, 2025
Don't install msys2 in CI

windows-msvc doesn't need it and windows-gnu installs its own version

This might still fail on window-msvc if it turns out we need to setup Visual Studio in `PATH`. I don't know how the default `bash` is configured. This will fail on the one remaining run-make test but let's see if it gets that far.

try-job: x86_64-msvc-1
try-job: i686-msvc-1
try-job: i686-mingw
try-job: x86_64-mingw-1

r? ghost
@bors
Copy link
Contributor

bors commented Feb 5, 2025

⌛ Trying commit c94ab20 with merge 6896d6e...

@bors
Copy link
Contributor

bors commented Feb 5, 2025

☀️ Try build successful - checks-actions
Build commit: 6896d6e (6896d6e9adfe1dd2de222e2a597a970ef8064fc0)

@ChrisDenton
Copy link
Member Author

It seems like this is now entirely unnecessary

r? infra-ci

@ChrisDenton
Copy link
Member Author

Wait let me just try the dist jobs, just to be sure nothing is using it.

@bors try

@bors
Copy link
Contributor

bors commented Feb 6, 2025

⌛ Trying commit c94ab20 with merge 92de1572c8bf8fb3f3cf1d8493c666346368ca36...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 6, 2025
Don't install msys2 in CI

windows-msvc doesn't need it and windows-gnu [installs its own version](https://github.com/rust-lang/rust/blob/master/src/ci/scripts/install-mingw.sh)

try-job: dist-x86_64-msvc
try-job: dist-i686-msvc
try-job: dist-aarch64-msvc
try-job: dist-i686-mingw
try-job: dist-x86_64-mingw
try-job: dist-x86_64-msvc-alt
@mati865
Copy link
Contributor

mati865 commented Feb 6, 2025

windows-gnu installs its own version

It has nothing to do with MSYS2. The linked code installs mingw-w64 GNU toolchain.

@ChrisDenton
Copy link
Member Author

Right I should have said "its own tools". Things like a bash emulator are already installed on the host and we don't need to install a package manager for anything.

@Kobzol
Copy link
Contributor

Kobzol commented Feb 6, 2025

Hmm, I remember several attempts to fix this and it always failed, would be cool if we can indeed remove it :D We still run a makefile in Windows CI, I'm kind of surprised that it runs without msys2. Can Windows just execute the Makefile now?

@ChrisDenton
Copy link
Member Author

I believe the last Makefile has now just been removed in #135572 (though maybe after the try run here). But yes I did expect that to fail. Surprising it didn't but in any case that shouldn't be an issue going forward.

@Kobzol
Copy link
Contributor

Kobzol commented Feb 6, 2025

I didn't mean run-make tests, but src/bootstrap/mk/Makefile.in, which is used to run CI tests on Windows.

@ChrisDenton
Copy link
Member Author

Oh, huh. Maybe the newer runners have make installed?

I guess my next question would be, do we need make for running Windows tests in CI?

@Kobzol
Copy link
Contributor

Kobzol commented Feb 6, 2025

I don't think so, it's mostly just a historical artifact. I'll try to get rid of it.

@bors
Copy link
Contributor

bors commented Feb 6, 2025

☀️ Try build successful - checks-actions
Build commit: 92de157 (92de1572c8bf8fb3f3cf1d8493c666346368ca36)

@ChrisDenton
Copy link
Member Author

Those succeeded too so should this be blocked on removing the testing Makefile or not?

@Kobzol
Copy link
Contributor

Kobzol commented Feb 6, 2025

We don't need to block on it. Since all these jobs passed, probably Makefile is installed somehow by default. Let's try it!

@bors r+ rollup=never

(Marking as rollup=never since perhaps some other jobs might be affected, who knows)

@bors
Copy link
Contributor

bors commented Feb 6, 2025

📌 Commit c94ab20 has been approved by Kobzol

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 Feb 6, 2025
@mati865
Copy link
Contributor

mati865 commented Feb 6, 2025

Oh, huh. Maybe the newer runners have make installed?

I guess my next question would be, do we need make for running Windows tests in CI?

IIRC there is MSYS2 preinstalled in GHA images for some time now, so make is still available.

@matthiaskrgr
Copy link
Member

@bors p=4

@bors
Copy link
Contributor

bors commented Feb 8, 2025

⌛ Testing commit c94ab20 with merge e060723...

@bors
Copy link
Contributor

bors commented Feb 8, 2025

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing e060723 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 8, 2025
@bors bors merged commit e060723 into rust-lang:master Feb 8, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 8, 2025
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e060723): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.2% [0.2%, 0.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 2.8%, secondary 2.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
2.8% [2.8%, 2.8%] 1
Regressions ❌
(secondary)
2.4% [2.4%, 2.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.8% [2.8%, 2.8%] 1

Cycles

Results (secondary -0.7%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.6% [2.6%, 2.6%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.0% [-4.0%, -4.0%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 778.956s -> 778.909s (-0.01%)
Artifact size: 329.06 MiB -> 329.06 MiB (0.00%)

@ChrisDenton ChrisDenton deleted the no-msys2 branch February 8, 2025 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants