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

Split x86_64-apple builder into two #93862

Merged
merged 1 commit into from
Feb 11, 2022
Merged

Conversation

Mark-Simulacrum
Copy link
Member

This splits out roughly 20-25 minutes of work, which should result in roughly parity with some of the other apple builders at approximately 2.2-2.4 hours per successful build.

r? @pietroalbini

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 10, 2022
@pietroalbini
Copy link
Member

Looks good other than the nit about deduplication.

@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Feb 10, 2022

@bors r=pietroalbini p=1 rollup

I'm not entirely convinced about the duplication being bad -- it's already semi-duplicated across the dist-x86_64-apple builders as well, and seems a little hard to avoid as each one has its own slightly unique take regardless -- but the test builders I suppose could be seen as distinct. In the meantime it doesn't really hurt (edit: to deduplicate).

@bors
Copy link
Contributor

bors commented Feb 10, 2022

📌 Commit a023be9 has been approved by pietroalbini

@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 Feb 10, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 11, 2022
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#92242 (Erase regions before calculating layout for packed field capture)
 - rust-lang#93443 (Add comment on stable_hash_impl for OwnerNodes)
 - rust-lang#93742 (Drop rustc-docs from complete profile)
 - rust-lang#93852 (rustdoc: remove support for multi-query search)
 - rust-lang#93853 (Make all `hir::Map` methods consistently by-value)
 - rust-lang#93861 (Fix ICE if no trait assoc const eq)
 - rust-lang#93862 (Split x86_64-apple builder into two)
 - rust-lang#93864 (Remove ArchiveBuilder::update_symbols)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 219fc8f into rust-lang:master Feb 11, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants