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.

Sign up for GitHub

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

Jump to bottom

CI: split x86_64-msvc-ext job #133248

Merged
merged 1 commit into from
Nov 27, 2024
Merged

CI: split x86_64-msvc-ext job #133248

merged 1 commit into from
Nov 27, 2024

Conversation

MarcoIeni
Copy link
Member

@MarcoIeni MarcoIeni commented Nov 20, 2024 •
edited
Loading

I'm splitting this job into two so that we can use free runners instead of large runners.

try-job: x86_64-msvc-ext1
try-job: x86_64-msvc-ext3

@rustbot
Copy link
Collaborator

rustbot commented Nov 20, 2024

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

@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 Nov 20, 2024
@MarcoIeni
Copy link
Member Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2024
@bors
Auto merge of rust-lang#133248 - MarcoIeni:x86_64-msvc-ext-free, r=<try>
8ad199b 
CI: use free runner in x86_64-msvc-ext

try-job: x86_64-msvc-ext
@bors
Copy link
Contributor

bors commented Nov 20, 2024

⌛ Trying commit 72ec288 with merge 8ad199b...

@bors
Copy link
Contributor

bors commented Nov 20, 2024

☀️ Try build successful - checks-actions
Build commit: 8ad199b (8ad199b7aeebfb192b2783e893dc21a0d5af88a3)

@MarcoIeni
Copy link
Member Author

trying again to check if there are cache misses somewhere.

@MarcoIeni
Copy link
Member Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2024
@bors
Auto merge of rust-lang#133248 - MarcoIeni:x86_64-msvc-ext-free, r=<try>
943ae67 
CI: use free runner in x86_64-msvc-ext

try-job: x86_64-msvc-ext
@bors
Copy link
Contributor

bors commented Nov 20, 2024

⌛ Trying commit 72ec288 with merge 943ae67...

@bors
Copy link
Contributor

bors commented Nov 20, 2024

☀️ Try build successful - checks-actions
Build commit: 943ae67 (943ae67e679e84b9a5e8c398662783e1cefcba29)

@ChrisDenton
Copy link
Member

Oh btw I would like to rejoin it with msvc-ext2. Splitting them was only intended to be a temporary hack. If we do want them split long term then there's hopefully a more principled way to do it.

@MarcoIeni
Copy link
Member Author

We're trying to remove work from large runners, so I would prefer not joining the two jobs.
For example, I'm trying to split another job as well in #132721

If we do want them split long term then there's hopefully a more principled way to do it.

Yes, hopefully, I don't have a good solution. There's some discussion in zulip.

I asked the bootstrap team to hopefully find a better solution. I'm open to suggestions.

@MarcoIeni
Copy link
Member Author

MarcoIeni commented Nov 21, 2024 •
edited
Loading

I have a question Chris, I see that the following env variables are different:

      HOST_TARGET: x86_64-pc-windows-msvc
      RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
      DEPLOY_TOOLSTATES_JSON: toolstates-windows.json

should the second job have the same env variables as the first one? If not, why?

@MarcoIeni
Copy link
Member Author

For the reviewer of this PR: I tried splitting the job because it took too long: 2h 52m

So I introduced a third job. Let's see how it goes!

@MarcoIeni
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Nov 21, 2024

⌛ Trying commit 395a386 with merge ee813ac...

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 21, 2024
@bors
Auto merge of rust-lang#133248 - MarcoIeni:x86_64-msvc-ext-free, r=<try>
ee813ac 
CI: use free runner in x86_64-msvc-ext

try-job: x86_64-msvc-ext
try-job: x86_64-msvc-ext3
@bors
Copy link
Contributor

bors commented Nov 21, 2024

☀️ Try build successful - checks-actions
Build commit: ee813ac (ee813acbc208f312e5f18899fb6b5af67e31d3b5)

@MarcoIeni
Copy link
Member Author

Nice, the timings look reasonable!
image

@MarcoIeni MarcoIeni changed the title CI: use free runner in x86_64-msvc-ext CI: split x86_64-msvc-ext job Nov 21, 2024
@MarcoIeni MarcoIeni force-pushed the x86_64-msvc-ext-free branch from 395a386 to da94a89 Compare November 21, 2024 12:43
@MarcoIeni MarcoIeni marked this pull request as ready for review November 21, 2024 12:44
@ChrisDenton
Copy link
Member

I have a question Chris, I see that the following env variables are different:

      HOST_TARGET: x86_64-pc-windows-msvc
      RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
      DEPLOY_TOOLSTATES_JSON: toolstates-windows.json

should the second job have the same env variables as the first one? If not, why?

I can't recall exactly but probably because the second job doesn't update the toolstate. It basically just very arbitrarily splits off a part of checktools.sh.

@MarcoIeni
Copy link
Member Author

r? @Kobzol

@rustbot rustbot assigned Kobzol and unassigned Mark-Simulacrum Nov 22, 2024
@MarcoIeni MarcoIeni force-pushed the x86_64-msvc-ext-free branch from da94a89 to e8796c4 Compare November 25, 2024 09:00
@MarcoIeni
Copy link
Member Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 25, 2024
@bors
Auto merge of rust-lang#133248 - MarcoIeni:x86_64-msvc-ext-free, r=<try>
3377fff 
CI: split x86_64-msvc-ext job

try-job: x86_64-msvc-ext1
try-job: x86_64-msvc-ext3
@bors
Copy link
Contributor

bors commented Nov 25, 2024

⌛ Trying commit e8796c4 with merge 3377fff...

@bors
Copy link
Contributor

bors commented Nov 25, 2024

☀️ Try build successful - checks-actions
Build commit: 3377fff (3377fff2a63b9e9d17304b64cfbf97698c977637)

@Kobzol
Copy link
Contributor

Kobzol commented Nov 25, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Nov 25, 2024

📌 Commit e8796c4 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 Nov 25, 2024
jhpratt added a commit to jhpratt/rust that referenced this pull request Nov 26, 2024
@jhpratt
Rollup merge of rust-lang#133248 - MarcoIeni:x86_64-msvc-ext-free, r=…
2b56782 
…Kobzol

CI: split x86_64-msvc-ext job

try-job: x86_64-msvc-ext1
try-job: x86_64-msvc-ext3
@jhpratt jhpratt mentioned this pull request Nov 26, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 26, 2024
@bors
Auto merge of rust-lang#133490 - jhpratt:rollup-f4ao5vz, r=jhpratt
33c3a5e 
Rollup of 28 pull requests

Successful merges:

 - rust-lang#132605 (CI: increase timeout from 4h to 6h)
 - rust-lang#133042 (btree: add `{Entry,VacantEntry}::insert_entry`)
 - rust-lang#133070 (Lexer tweaks)
 - rust-lang#133136 (Support ranges in `<[T]>::get_many_mut()`)
 - rust-lang#133140 (Inline ExprPrecedence::order into Expr::precedence)
 - rust-lang#133248 (CI: split x86_64-msvc-ext job)
 - rust-lang#133282 (Shorten the `MaybeUninit` `Debug` implementation)
 - rust-lang#133304 (Revert diagnostics hack to fix ICE 132920)
 - rust-lang#133326 (Remove the `DefinitelyInitializedPlaces` analysis.)
 - rust-lang#133362 (No need to re-sort existential preds in relate impl)
 - rust-lang#133367 (Simplify array length mismatch error reporting (to not try to turn consts into target usizes))
 - rust-lang#133394 (Bail on more errors in dyn ty lowering)
 - rust-lang#133410 (target check_consistency: ensure target feature string makes some basic sense)
 - rust-lang#133411 (the emscripten OS no longer exists on non-wasm targets)
 - rust-lang#133419 (Added a doc test for std::path::strip_prefix)
 - rust-lang#133430 (Tweak parameter mismatch explanation to not say `{unknown}`)
 - rust-lang#133435 (miri: disable test_downgrade_observe test on macOS)
 - rust-lang#133443 (Remove dead code stemming from the old effects desugaring (II))
 - rust-lang#133449 (std: expose `const_io_error!` as `const_error!`)
 - rust-lang#133450 (remove "onur-ozkan" from  users_on_vacation)
 - rust-lang#133454 (Update test expectations to accept LLVM 'initializes' attribute)
 - rust-lang#133458 (Fix `Result` and `Option` not getting a jump to def link generated)
 - rust-lang#133462 (Use ReadCache for archive reading in bootstrap)
 - rust-lang#133464 (std::thread: avoid leading whitespace in some panic messages)
 - rust-lang#133467 (tests: Add recursive associated type bound regression tests)
 - rust-lang#133470 (Cleanup: delete `//@ pretty-expanded` directive)
 - rust-lang#133473 (tests: Add regression test for recursive enum with Cow and Clone)
 - rust-lang#133481 (Disable `avr-rjmp-offset` on Windows for now)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 26, 2024
@bors
Auto merge of rust-lang#133490 - jhpratt:rollup-f4ao5vz, r=jhpratt
199955e 
Rollup of 28 pull requests

Successful merges:

 - rust-lang#132605 (CI: increase timeout from 4h to 6h)
 - rust-lang#133042 (btree: add `{Entry,VacantEntry}::insert_entry`)
 - rust-lang#133070 (Lexer tweaks)
 - rust-lang#133136 (Support ranges in `<[T]>::get_many_mut()`)
 - rust-lang#133140 (Inline ExprPrecedence::order into Expr::precedence)
 - rust-lang#133248 (CI: split x86_64-msvc-ext job)
 - rust-lang#133282 (Shorten the `MaybeUninit` `Debug` implementation)
 - rust-lang#133304 (Revert diagnostics hack to fix ICE 132920)
 - rust-lang#133326 (Remove the `DefinitelyInitializedPlaces` analysis.)
 - rust-lang#133362 (No need to re-sort existential preds in relate impl)
 - rust-lang#133367 (Simplify array length mismatch error reporting (to not try to turn consts into target usizes))
 - rust-lang#133394 (Bail on more errors in dyn ty lowering)
 - rust-lang#133410 (target check_consistency: ensure target feature string makes some basic sense)
 - rust-lang#133411 (the emscripten OS no longer exists on non-wasm targets)
 - rust-lang#133419 (Added a doc test for std::path::strip_prefix)
 - rust-lang#133430 (Tweak parameter mismatch explanation to not say `{unknown}`)
 - rust-lang#133435 (miri: disable test_downgrade_observe test on macOS)
 - rust-lang#133443 (Remove dead code stemming from the old effects desugaring (II))
 - rust-lang#133449 (std: expose `const_io_error!` as `const_error!`)
 - rust-lang#133450 (remove "onur-ozkan" from  users_on_vacation)
 - rust-lang#133454 (Update test expectations to accept LLVM 'initializes' attribute)
 - rust-lang#133458 (Fix `Result` and `Option` not getting a jump to def link generated)
 - rust-lang#133462 (Use ReadCache for archive reading in bootstrap)
 - rust-lang#133464 (std::thread: avoid leading whitespace in some panic messages)
 - rust-lang#133467 (tests: Add recursive associated type bound regression tests)
 - rust-lang#133470 (Cleanup: delete `//@ pretty-expanded` directive)
 - rust-lang#133473 (tests: Add regression test for recursive enum with Cow and Clone)
 - rust-lang#133481 (Disable `avr-rjmp-offset` on Windows for now)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 26, 2024
@bors
Auto merge of rust-lang#133490 - jhpratt:rollup-f4ao5vz, r=jhpratt
6ce8a37 
Rollup of 28 pull requests

Successful merges:

 - rust-lang#132605 (CI: increase timeout from 4h to 6h)
 - rust-lang#133042 (btree: add `{Entry,VacantEntry}::insert_entry`)
 - rust-lang#133070 (Lexer tweaks)
 - rust-lang#133136 (Support ranges in `<[T]>::get_many_mut()`)
 - rust-lang#133140 (Inline ExprPrecedence::order into Expr::precedence)
 - rust-lang#133248 (CI: split x86_64-msvc-ext job)
 - rust-lang#133282 (Shorten the `MaybeUninit` `Debug` implementation)
 - rust-lang#133304 (Revert diagnostics hack to fix ICE 132920)
 - rust-lang#133326 (Remove the `DefinitelyInitializedPlaces` analysis.)
 - rust-lang#133362 (No need to re-sort existential preds in relate impl)
 - rust-lang#133367 (Simplify array length mismatch error reporting (to not try to turn consts into target usizes))
 - rust-lang#133394 (Bail on more errors in dyn ty lowering)
 - rust-lang#133410 (target check_consistency: ensure target feature string makes some basic sense)
 - rust-lang#133411 (the emscripten OS no longer exists on non-wasm targets)
 - rust-lang#133419 (Added a doc test for std::path::strip_prefix)
 - rust-lang#133430 (Tweak parameter mismatch explanation to not say `{unknown}`)
 - rust-lang#133435 (miri: disable test_downgrade_observe test on macOS)
 - rust-lang#133443 (Remove dead code stemming from the old effects desugaring (II))
 - rust-lang#133449 (std: expose `const_io_error!` as `const_error!`)
 - rust-lang#133450 (remove "onur-ozkan" from  users_on_vacation)
 - rust-lang#133454 (Update test expectations to accept LLVM 'initializes' attribute)
 - rust-lang#133458 (Fix `Result` and `Option` not getting a jump to def link generated)
 - rust-lang#133462 (Use ReadCache for archive reading in bootstrap)
 - rust-lang#133464 (std::thread: avoid leading whitespace in some panic messages)
 - rust-lang#133467 (tests: Add recursive associated type bound regression tests)
 - rust-lang#133470 (Cleanup: delete `//@ pretty-expanded` directive)
 - rust-lang#133473 (tests: Add regression test for recursive enum with Cow and Clone)
 - rust-lang#133481 (Disable `avr-rjmp-offset` on Windows for now)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 27, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 27, 2024
@bors
Auto merge of rust-lang#133527 - matthiaskrgr:rollup-kyre1df, r=matth…
5f8a240 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#132979 (use `--exact` on `--skip` to avoid unintended substring matches)
 - rust-lang#133248 (CI: split x86_64-msvc-ext job)
 - rust-lang#133449 (std: expose `const_io_error!` as `const_error!`)
 - rust-lang#133453 (Commit license-metadata.json to git and check it's correct in CI)
 - rust-lang#133457 (miri: implement `TlsFree`)
 - rust-lang#133493 (do not constrain infer vars in `find_best_leaf_obligation`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 21f6ef5 into rust-lang:master Nov 27, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Nov 27, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 27, 2024
@rust-timer
Unrolled build for rust-lang#133248
27eb9cb 
Rollup merge of rust-lang#133248 - MarcoIeni:x86_64-msvc-ext-free, r=Kobzol

CI: split x86_64-msvc-ext job

try-job: x86_64-msvc-ext1
try-job: x86_64-msvc-ext3
@tgross35 tgross35 mentioned this pull request Dec 10, 2024
Draft
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2024
@bors
Auto merge of rust-lang#134150 - tgross35:test-msvc-revert, r=<try>
4d49ddc 
[experiment] Try reverting the MSVC workarounds

Get a fresh set of runs with the following workarounds reverted:

- rust-lang#130151
- rust-lang#130072
- rust-lang#133248

try-job: x86_64-msvc
try-job: x86_64-msvc-ext
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kobzol Kobzol Kobzol left review comments

Assignees

@Kobzol Kobzol

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
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.
6 participants
@MarcoIeni @rustbot @bors @ChrisDenton @Kobzol @Mark-Simulacrum