Skip to content

More EC2 instance usage - #161562

Merged
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
Mark-Simulacrum:alt-ec2
Aug 24, 2026
Merged

More EC2 instance usage#161562
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
Mark-Simulacrum:alt-ec2

Conversation

@Mark-Simulacrum

Copy link
Copy Markdown
Member

This extends our usage of EC2 to dist-x86_64-linux-alt builders (1h23m with m8a.2xlarge, https://github.com/rust-lang/rust/actions/runs/32137297331/job/95711706485).

This is moving from GHA credits to EC2 credits, so we should confirm we want that, but in dollar terms this is cheaper: at 1h55m (last auto build) on GHA $1.32/hr = $2.53/run, vs. 1h23m on EC2 at $0.48688/hr = $0.67/run.

My primary goal is to try to free up GHA credits so we can move Windows and/or macOS jobs to large runners, since I suspect us trying to host those ourselves is going to be more painful.

As a drive-by change this also adds support for EC2 aarch64 machines to the bors config (but not CI config). My suspicion is that if/when we have aarch64 perf we may want faster aarch64 try builds, and in any case dist-aarch64-linux is one of our slower runners -- at 2h24m -- so it may benefit from getting a faster machine. I don't know yet how EC2 will compare but extending the bors config is cheap so I'd rather just do that now to enable easier testing.

I also deleted some of the old unused runner templates, I don't see much point in keeping dead ones around.

r? Kobzol

This also cleans up some legacy runner configurations that aren't
currently used. We can always restore these if needed and it's
distracting when trying to identify what GitHub large runners are
getting used.

dist-alt.sh does less (no opt-dist) so we run it on a less powerful EC2
instance.
@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Aug 22, 2026
@rustbot

rustbot commented Aug 22, 2026

Copy link
Copy Markdown
Collaborator

Kobzol is not on the review rotation at the moment.
They may take a while to respond.

@Mark-Simulacrum

Copy link
Copy Markdown
Member Author

@bors try jobs=dist-x86_64-linux,dist-x86_64-linux-quick,dist-x86_64-linux-alt

@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Aug 22, 2026
More EC2 instance usage


try-job: dist-x86_64-linux
try-job: dist-x86_64-linux-quick
try-job: dist-x86_64-linux-alt
@rust-bors

rust-bors Bot commented Aug 22, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: fbaaf56 (fbaaf567af80f4d7e0d74be6c37ac6033233a7b2)
Base parent: 78c04b6 (78c04b6a348438fb9396b8864cd34f92fb99cd53)

@Mark-Simulacrum
Mark-Simulacrum marked this pull request as ready for review August 22, 2026 23:19
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 22, 2026
@rustbot

rustbot commented Aug 22, 2026

Copy link
Copy Markdown
Collaborator

Warning

If you are changing how CI LLVM is built or linked, make sure to bump
src/bootstrap/download-ci-llvm-stamp.

cc @jieyouxu

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 22, 2026
@Kobzol

Kobzol commented Aug 24, 2026

Copy link
Copy Markdown
Member

Nice! With this, we could reinstate doing PGO + BOLT in the -alt runners (though that would probably require using the higher core runner and that's probably not worth it). I definitely agree with saving credits for Windows/Apple GHA-hosted large runners, and instead running more of our Linux self-hosted instances, rather than trying to self host Windows/Apple, that sounds scary.

@bors r+ rollup

@rust-bors

rust-bors Bot commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

📌 Commit c882349 has been approved by Kobzol

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Aug 24, 2026
free_disk: true
<<: *base-job

- &job-linux-4c-largedisk

@Kobzol Kobzol Aug 24, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we sometimes need to quickly switch to this one if space starts running out on the free 4 core runners. But I don't remember seeing it being used for some time, so let's try to remove it.

View changes since the review

rust-bors Bot pushed a commit that referenced this pull request Aug 24, 2026
…uwer

Rollup of 6 pull requests

Successful merges:

 - #159434 (fix: suggest removing a trailing semicolon when a closure argument fails a trait bound)
 - #160428 (Add more context to dyn-compatibility diagnostic for receiver-less associated functions)
 - #161166 (add crashtests [5/N], remove unused aux files )
 - #161310 (Add regression test for extern crate alias shadowed by a module of the same name)
 - #161509 (Add regression test for private fields lint)
 - #161562 (More EC2 instance usage)
@rust-bors
rust-bors Bot merged commit d53b84d into rust-lang:main Aug 24, 2026
13 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Aug 24, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 24, 2026
Rollup merge of #161562 - Mark-Simulacrum:alt-ec2, r=Kobzol

More EC2 instance usage

This extends our usage of EC2 to dist-x86_64-linux-alt builders (1h23m with m8a.2xlarge, https://github.com/rust-lang/rust/actions/runs/32137297331/job/95711706485).

This is moving from GHA credits to EC2 credits, so we should confirm we want that, but in dollar terms this is cheaper: at 1h55m (last auto build) on [GHA $1.32/hr](https://docs.github.com/en/billing/reference/actions-runner-pricing) = $2.53/run, vs. 1h23m on EC2 at $0.48688/hr = $0.67/run.

My primary goal is to try to free up GHA credits so we can move Windows and/or macOS jobs to large runners, since I suspect us trying to host those ourselves is going to be more painful.

As a drive-by change this also adds support for EC2 aarch64 machines to the bors config (but not CI config). My suspicion is that if/when we have aarch64 perf we may want faster aarch64 try builds, and in any case dist-aarch64-linux is one of our slower runners -- at 2h24m -- so it may benefit from getting a faster machine. I don't know yet how EC2 will compare but extending the bors config is cheap so I'd rather just do that now to enable easier testing.

I also deleted some of the old unused runner templates, I don't see much point in keeping dead ones around.

r? Kobzol
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Aug 24, 2026
…uwer

Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#159434 (fix: suggest removing a trailing semicolon when a closure argument fails a trait bound)
 - rust-lang/rust#160428 (Add more context to dyn-compatibility diagnostic for receiver-less associated functions)
 - rust-lang/rust#161166 (add crashtests [5/N], remove unused aux files )
 - rust-lang/rust#161310 (Add regression test for extern crate alias shadowed by a module of the same name)
 - rust-lang/rust#161509 (Add regression test for private fields lint)
 - rust-lang/rust#161562 (More EC2 instance usage)
@Mark-Simulacrum
Mark-Simulacrum deleted the alt-ec2 branch August 28, 2026 03:31
rust-bors Bot pushed a commit that referenced this pull request Aug 30, 2026
Fix toml syntax in bors config

bors production is logging "Could not deserialize repository config: missing comma between key-value pairs, expected `,`" for at least a week (since landing #161562, I think). I assume it would fail to start if restarted? (Reproducible here: https://play.rust-lang.org/?version=stable&mode=debug&edition=2024&gist=9e7d78b0ae002de5d73c9c9f8f518f38).

I think we'll want to follow up to gate bors *merging* a PR breaking the toml syntax, I cut rust-lang/bors#829 to track that.

r? @Kobzol
rust-bors Bot pushed a commit that referenced this pull request Aug 30, 2026
Fix toml syntax in bors config

bors production is logging "Could not deserialize repository config: missing comma between key-value pairs, expected `,`" for at least a week (since landing #161562, I think). I assume it would fail to start if restarted? (Reproducible here: https://play.rust-lang.org/?version=stable&mode=debug&edition=2024&gist=9e7d78b0ae002de5d73c9c9f8f518f38).

I think we'll want to follow up to gate bors *merging* a PR breaking the toml syntax, I cut rust-lang/bors#829 to track that.

r? @Kobzol
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI 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.

3 participants