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

CI: use free runners for x86_64-gnu-llvm jobs #134124

Merged
merged 21 commits into from
Dec 16, 2024

Conversation

MarcoIeni
Copy link
Member

@MarcoIeni MarcoIeni commented Dec 10, 2024

Split the x86_64-gnu-llvm jobs in two to move them to free runners and reduce the use of large runners in CI.
r? @Kobzol

try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-19-2
try-job: x86_64-gnu-llvm-19-3
try-job: x86_64-gnu-llvm-18-1
try-job: x86_64-gnu-llvm-18-2
try-job: x86_64-gnu-llvm-18-3

@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 Dec 10, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Dec 10, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2024
CI: use free runners for x86_64-gnu-llvm jobs

try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-19-2
try-job: x86_64-gnu-llvm-18-1
try-job: x86_64-gnu-llvm-18-2
@bors
Copy link
Contributor

bors commented Dec 10, 2024

⌛ Trying commit 577b5f3 with merge dda92c0...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Dec 10, 2024

💔 Test failed - checks-actions

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 10, 2024
@MarcoIeni
Copy link
Member Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2024
CI: use free runners for x86_64-gnu-llvm jobs

try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-19-2
try-job: x86_64-gnu-llvm-18-1
try-job: x86_64-gnu-llvm-18-2
@bors
Copy link
Contributor

bors commented Dec 10, 2024

⌛ Trying commit e67e9b4 with merge 3a90623...

@bors
Copy link
Contributor

bors commented Dec 10, 2024

☀️ Try build successful - checks-actions
Build commit: 3a90623 (3a906231e57c11e9af1a025356a4d7d7acff0fd7)

@Kobzol
Copy link
Contributor

Kobzol commented Dec 10, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2024
CI: use free runners for x86_64-gnu-llvm jobs

try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-19-2
try-job: x86_64-gnu-llvm-18-1
try-job: x86_64-gnu-llvm-18-2
@bors
Copy link
Contributor

bors commented Dec 10, 2024

⌛ Trying commit e67e9b4 with merge 786e8ac...

@bors
Copy link
Contributor

bors commented Dec 10, 2024

☀️ Try build successful - checks-actions
Build commit: 786e8ac (786e8ac3c40d1020fa839ccff8ef4070960ea800)

@Kobzol
Copy link
Contributor

Kobzol commented Dec 10, 2024

Too slow. Docker was cached, so that was not it. Probably in this case the build part is slower than the test part? We could use my/your infra analysis scripts to confirm.

@MarcoIeni
Copy link
Member Author

we were repeating many thing among the two jobs, I created two script to easily test the job split. Once we are satisfied with this experiment, we can find a more "idiomatic" way to split the tasks among the two jobs 👍

@MarcoIeni
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Dec 11, 2024

⌛ Trying commit 4f0e781 with merge 11e24c3...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2024
CI: use free runners for x86_64-gnu-llvm jobs

try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-19-2
try-job: x86_64-gnu-llvm-18-1
try-job: x86_64-gnu-llvm-18-2
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@MarcoIeni
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Dec 12, 2024

⌛ Trying commit ac078a4 with merge b9306da...

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 12, 2024
CI: use free runners for x86_64-gnu-llvm jobs

try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-19-2
try-job: x86_64-gnu-llvm-19-3
try-job: x86_64-gnu-llvm-18-1
try-job: x86_64-gnu-llvm-18-2
try-job: x86_64-gnu-llvm-18-3
@bors
Copy link
Contributor

bors commented Dec 12, 2024

☀️ Try build successful - checks-actions
Build commit: b9306da (b9306da077ca87a4647b94706d0ef3907619ea0f)

@MarcoIeni
Copy link
Member Author

Looks good 👍
image

@MarcoIeni MarcoIeni marked this pull request as ready for review December 13, 2024 08:19

set -ex

/tmp/add_dummy_commit.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should only be needed for the bootstrap self tests, but the way the skips are configured, these now probably run on both llvm[1/2/3]. Anyway, it doesn't hurt to run it everywhere.

@Kobzol
Copy link
Contributor

Kobzol commented Dec 16, 2024

I can't say that I'm happy about this 😆 But it is what it is.

@Kobzol
Copy link
Contributor

Kobzol commented Dec 16, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Dec 16, 2024

📌 Commit ac078a4 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 16, 2024
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 16, 2024
CI: use free runners for x86_64-gnu-llvm jobs

try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-19-2
try-job: x86_64-gnu-llvm-19-3
try-job: x86_64-gnu-llvm-18-1
try-job: x86_64-gnu-llvm-18-2
try-job: x86_64-gnu-llvm-18-3
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 16, 2024
CI: use free runners for x86_64-gnu-llvm jobs

try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-19-2
try-job: x86_64-gnu-llvm-19-3
try-job: x86_64-gnu-llvm-18-1
try-job: x86_64-gnu-llvm-18-2
try-job: x86_64-gnu-llvm-18-3
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 16, 2024
CI: use free runners for x86_64-gnu-llvm jobs

try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-19-2
try-job: x86_64-gnu-llvm-19-3
try-job: x86_64-gnu-llvm-18-1
try-job: x86_64-gnu-llvm-18-2
try-job: x86_64-gnu-llvm-18-3
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
…llaumeGomez

Rollup of 9 pull requests

Successful merges:

 - rust-lang#132056 (Stabilize `#[diagnostic::do_not_recommend]`)
 - rust-lang#134124 (CI: use free runners for x86_64-gnu-llvm jobs)
 - rust-lang#134197 (rustc_mir_build: Clarify that 'mirrored' does not mean 'flipped' or 'reversed')
 - rust-lang#134260 (Correctly handle comments in attributes in doctests source code)
 - rust-lang#134277 (rustdoc-search: handle `impl Into<X>` better)
 - rust-lang#134284 (Keep track of patterns that could have introduced a binding, but didn't)
 - rust-lang#134337 (reject unsound toggling of RISCV target features)
 - rust-lang#134385 (tests/ui/asm: Remove uses of rustc_attrs, lang_items, and decl_macro features by using minicore)
 - rust-lang#134386 (Some trait method vs impl method signature difference diagnostic cleanups)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#134124 (CI: use free runners for x86_64-gnu-llvm jobs)
 - rust-lang#134197 (rustc_mir_build: Clarify that 'mirrored' does not mean 'flipped' or 'reversed')
 - rust-lang#134260 (Correctly handle comments in attributes in doctests source code)
 - rust-lang#134277 (rustdoc-search: handle `impl Into<X>` better)
 - rust-lang#134284 (Keep track of patterns that could have introduced a binding, but didn't)
 - rust-lang#134337 (reject unsound toggling of RISCV target features)
 - rust-lang#134371 (Check for array lengths that aren't actually `usize`)
 - rust-lang#134385 (tests/ui/asm: Remove uses of rustc_attrs, lang_items, and decl_macro features by using minicore)
 - rust-lang#134386 (Some trait method vs impl method signature difference diagnostic cleanups)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0ff00b6 into rust-lang:master Dec 16, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 16, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 16, 2024
Rollup merge of rust-lang#134124 - MarcoIeni:split-llvm-jobs, r=Kobzol

CI: use free runners for x86_64-gnu-llvm jobs

try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-19-2
try-job: x86_64-gnu-llvm-19-3
try-job: x86_64-gnu-llvm-18-1
try-job: x86_64-gnu-llvm-18-2
try-job: x86_64-gnu-llvm-18-3
@lqd
Copy link
Member

lqd commented Dec 17, 2024

For future PRs, it would be nice to clean up the commit history before landing, thanks! 🙏

@MarcoIeni
Copy link
Member Author

oh my god, sorry...I forgot 😵

@Kobzol
Copy link
Contributor

Kobzol commented Dec 17, 2024

Sorry, also missed this.

@lqd
Copy link
Member

lqd commented Dec 17, 2024

It's ok ^^

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