Try to not reinstall tools in mingw CI #125546

ChrisDenton · 2024-05-25T12:47:45Z

Reinstalling the tools seems prone to failure (e.g. latest) and is more work. It also seems unnecessary as CI actually uses a vendored tarball for builds.

cc @mati865

rustbot · 2024-05-25T12:47:53Z

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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

ChrisDenton · 2024-05-25T15:20:49Z

mingw CI looks happy https://github.com/rust-lang/rust/actions/runs/9235561579?pr=125546

Mark-Simulacrum · 2024-05-25T22:34:03Z

@bors r

bors · 2024-05-25T22:34:05Z

📌 Commit 2429e1b has been approved by Mark-Simulacrum

It is now in the queue for this repository.

…acrum Try to not reinstall tools in mingw CI Reinstalling the tools seems prone to failure (e.g. [latest](rust-lang#125529 (comment))) and is more work. It also seems unnecessary as CI actually uses a vendored tarball for builds. cc `@mati865`

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#125307 (tidy: stop special-casing tests/ui entry limit) - rust-lang#125375 (Create a triagebot ping group for Rust for Linux) - rust-lang#125413 (drop region constraints for ambiguous goals) - rust-lang#125433 (A small diagnostic improvement for dropping_copy_types) - rust-lang#125508 (Stop SRoA'ing `DynMetadata` in MIR) - rust-lang#125530 (cleanup dependence of `ExtCtxt` in transcribe when macro expansion) - rust-lang#125544 (Also mention my-self for other check-cfg docs changes) - rust-lang#125546 (Try to not reinstall tools in mingw CI) r? `@ghost` `@rustbot` modify labels: rollup

fmease · 2024-05-26T01:27:12Z

Is it possible that this PR has caused #125557 (comment) 🤔? Or is that completely out of question? 😅

…acrum Try to not reinstall tools in mingw CI Reinstalling the tools seems prone to failure (e.g. [latest](rust-lang#125529 (comment))) and is more work. It also seems unnecessary as CI actually uses a vendored tarball for builds. cc `@mati865`

workingjubilee · 2024-05-26T05:31:46Z

It seems possible.

@bors rollup=iffy

Rollup of 7 pull requests Successful merges: - rust-lang#125307 (tidy: stop special-casing tests/ui entry limit) - rust-lang#125375 (Create a triagebot ping group for Rust for Linux) - rust-lang#125433 (A small diagnostic improvement for dropping_copy_types) - rust-lang#125508 (Stop SRoA'ing `DynMetadata` in MIR) - rust-lang#125530 (cleanup dependence of `ExtCtxt` in transcribe when macro expansion) - rust-lang#125544 (Also mention my-self for other check-cfg docs changes) - rust-lang#125546 (Try to not reinstall tools in mingw CI) r? `@ghost` `@rustbot` modify labels: rollup

Try to not reinstall tools in mingw CI Reinstalling the tools seems prone to failure (e.g. [latest](rust-lang#125529 (comment))) and is more work. It also seems unnecessary as CI actually uses a vendored tarball for builds. cc `@mati865`

bors · 2024-05-26T06:33:32Z

⌛ Testing commit 2429e1b with merge a62debe...

jhpratt · 2024-05-26T06:36:18Z

@bors r-

Definite cause of #125565, which was opened before this was marked as iffy

jhpratt · 2024-05-26T06:37:38Z

@bors cancel

Edit: Not sure how to cancel an ongoing merge attempt?

fmease · 2024-05-26T06:41:10Z

@bors retry r-

ChrisDenton · 2024-05-26T11:04:05Z

Ok, I've now tested it on an msvc runner and it passes. The trick was to not install msys2, which used to be necessary for run-make but apparently isn't any longer (perhaps because many tests have been ported to recipes).

mati865 · 2024-05-26T14:24:39Z

src/ci/scripts/install-msys2.sh

-# Clean up and prepare the MSYS2 installation. MSYS2 is needed primarily for
-# the test suite (run-make), but is also used by the MinGW toolchain for assembling things.
+# Clean up and prepare the MSYS2 installation.
+# MSYS2 is used by the MinGW toolchain for assembling things.


I don't see MSYS2 anywhere in this script apart from the comment and filename, probably could be renamed to setup-windows-python.sh or something like that.

Yeah, I'm not convinced this script is still needed at all but I didn't want to change too much at once. Or if it is just needed by the mingw targets then it could be merged into the other script.

I think all Windows jobs need Python setup one way or another and after these changes this script is basically a custom actions/setup-python step: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#specifying-a-python-version

Hm, that says "To maintain consistent behavior with other runners and to allow Python to be used out-of-the-box without the setup-python action, GitHub adds a few versions from the tools cache to PATH"

Consistent behaviour with other runners sounds like something we can rely on, no?

We use custom Docker images on Linux builders, no idea about Mac. So this consistency won't really apply here.

Ah, I see. I think I'll experiment with maybe using the action in a follow up PR.

mati865 · 2024-05-26T14:26:16Z

src/ci/scripts/install-mingw.sh

@@ -39,10  39,7 @@ if isWindows; then
    esac

    if [[ "${CUSTOM_MINGW:-0}" == 0 ]]; then


I think this is just a dead code so a followup PR could get rid of all CUSTOM_MINGW occurrences.

Mark-Simulacrum · 2024-05-26T18:49:34Z

@bors r rollup=never p=1000

bors · 2024-05-26T18:49:36Z

📌 Commit 941aa47 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

bors · 2024-05-26T18:49:36Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

bors · 2024-05-26T18:50:51Z

⌛ Testing commit 941aa47 with merge bdbbb6c...

bors · 2024-05-26T20:59:12Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing bdbbb6c to master...

rust-timer · 2024-05-26T22:13:27Z

Finished benchmarking commit (bdbbb6c): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

Max RSS (memory usage)

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

Cycles

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

Binary size

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

Bootstrap: 670.186s -> 669.111s (-0.16%)
Artifact size: 315.55 MiB -> 315.57 MiB (0.00%)

rustbot assigned Mark-Simulacrum May 25, 2024

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 May 25, 2024

ChrisDenton added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 25, 2024

ChrisDenton force-pushed the mingw-ci branch from 9ad9a8d to 2429e1b Compare May 25, 2024 15:20

ChrisDenton marked this pull request as ready for review May 25, 2024 15:20

ChrisDenton added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 25, 2024

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 May 25, 2024

matthiaskrgr mentioned this pull request May 25, 2024

Rollup of 8 pull requests #125557

Closed

jhpratt mentioned this pull request May 26, 2024

Rollup of 7 pull requests #125565

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 26, 2024

This comment has been minimized.

Sign in to view

ChrisDenton force-pushed the mingw-ci branch from 2429e1b to fafa451 Compare May 26, 2024 07:19

This comment has been minimized.

Sign in to view

ChrisDenton force-pushed the mingw-ci branch from beec653 to a8a0ccb Compare May 26, 2024 09:18

Do less reinstalling in mingw CI

941aa47

ChrisDenton force-pushed the mingw-ci branch from a8a0ccb to 941aa47 Compare May 26, 2024 11:07

mati865 reviewed May 26, 2024

View reviewed changes

mati865 mentioned this pull request May 26, 2024

Simplify the unchecked_sh[lr] ub-checks a bit #125559

Merged

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 26, 2024

workingjubilee mentioned this pull request May 26, 2024

Clean out old msys2/mingw stuff in CI #125583

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label May 26, 2024

bors merged commit bdbbb6c into rust-lang:master May 26, 2024
7 checks passed

rustbot added this to the 1.80.0 milestone May 26, 2024

ChrisDenton deleted the mingw-ci branch May 26, 2024 21:04

workingjubilee mentioned this pull request May 26, 2024

Subtree update of rust-analyzer #125576

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Try to not reinstall tools in mingw CI #125546

Try to not reinstall tools in mingw CI #125546

ChrisDenton commented May 25, 2024

rustbot commented May 25, 2024

ChrisDenton commented May 25, 2024

Mark-Simulacrum commented May 25, 2024

bors commented May 25, 2024

fmease commented May 26, 2024

workingjubilee commented May 26, 2024

bors commented May 26, 2024

jhpratt commented May 26, 2024

jhpratt commented May 26, 2024 •

edited

Loading

fmease commented May 26, 2024

This comment has been minimized.

This comment has been minimized.

ChrisDenton commented May 26, 2024

mati865 May 26, 2024

ChrisDenton May 26, 2024

mati865 May 26, 2024

ChrisDenton May 26, 2024

mati865 May 26, 2024

ChrisDenton May 26, 2024

mati865 May 26, 2024

Mark-Simulacrum commented May 26, 2024

bors commented May 26, 2024

bors commented May 26, 2024

bors commented May 26, 2024

bors commented May 26, 2024

rust-timer commented May 26, 2024

		@@ -39,10 39,7 @@ if isWindows; then
		esac

		if [[ "${CUSTOM_MINGW:-0}" == 0 ]]; then

Try to not reinstall tools in mingw CI #125546

Try to not reinstall tools in mingw CI #125546

Conversation

ChrisDenton commented May 25, 2024

rustbot commented May 25, 2024

ChrisDenton commented May 25, 2024

Mark-Simulacrum commented May 25, 2024

bors commented May 25, 2024

fmease commented May 26, 2024

workingjubilee commented May 26, 2024

bors commented May 26, 2024

jhpratt commented May 26, 2024

jhpratt commented May 26, 2024 • edited Loading

fmease commented May 26, 2024

This comment has been minimized.

This comment has been minimized.

ChrisDenton commented May 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mark-Simulacrum commented May 26, 2024

bors commented May 26, 2024

bors commented May 26, 2024

bors commented May 26, 2024

bors commented May 26, 2024

rust-timer commented May 26, 2024

Overall result: ❌ regressions - no action needed

jhpratt commented May 26, 2024 •

edited

Loading