-
Notifications
You must be signed in to change notification settings - Fork 13.1k
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
Don't install msys2 in CI #136588
Conversation
windows-msvc doesn't need it and windows-gnu has its own version
@bors try |
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
☀️ Try build successful - checks-actions |
It seems like this is now entirely unnecessary r? infra-ci |
Wait let me just try the dist jobs, just to be sure nothing is using it. @bors try |
⌛ Trying commit c94ab20 with merge 92de1572c8bf8fb3f3cf1d8493c666346368ca36... |
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
It has nothing to do with MSYS2. The linked code installs mingw-w64 GNU toolchain. |
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. |
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? |
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. |
I didn't mean run-make tests, but |
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? |
I don't think so, it's mostly just a historical artifact. I'll try to get rid of it. |
☀️ Try build successful - checks-actions |
Those succeeded too so should this be blocked on removing the testing Makefile or not? |
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) |
IIRC there is MSYS2 preinstalled in GHA images for some time now, so make is still available. |
@bors p=4 |
☀️ Test successful - checks-actions |
Finished benchmarking commit (e060723): comparison URL. Overall result: ❌ regressions - no action needed@rustbot label: -perf-regression Instruction countThis 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.
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.
CyclesResults (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.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 778.956s -> 778.909s (-0.01%) |
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