Skip to content

Conversation

shepmaster
Copy link
Member

@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-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 Aug 26, 2025
@shepmaster
Copy link
Member Author

@bors2 try jobs=dist-aarch64-apple,dist-x86_64-apple

rust-bors bot added a commit that referenced this pull request Aug 26, 2025
Make macOS dist build configuration match where reasonable

try-job: dist-aarch64-apple
try-job: dist-x86_64-apple
@rust-bors

This comment has been minimized.

@rust-bors
Copy link

rust-bors bot commented Aug 26, 2025

💥 Test timed out after 21600s

@madsmtm
Copy link
Contributor

madsmtm commented Sep 4, 2025

@bors2 try jobs=dist-aarch64-apple,dist-x86_64-apple

rust-bors bot added a commit that referenced this pull request Sep 4, 2025
Make macOS dist build configuration match where reasonable

try-job: dist-aarch64-apple
try-job: dist-x86_64-apple
@rust-bors

This comment has been minimized.

Copy link
Contributor

@madsmtm madsmtm left a comment

Choose a reason for hiding this comment

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

Looks fine, feel free to r=me if CI passes

View changes since this review

@rust-bors
Copy link

rust-bors bot commented Sep 4, 2025

💔 Test for 7c8d24f failed: CI

@shepmaster
Copy link
Member Author

The job was not acquired by Runner of type hosted even after multiple attempts
Internal server error. Correlation ID: f34999f5-df47-436b-aaf8-85b99070b650

🤷

@bors2 try jobs=dist-aarch64-apple,dist-x86_64-apple

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Sep 5, 2025
Make macOS dist build configuration match where reasonable

try-job: dist-aarch64-apple
try-job: dist-x86_64-apple
@rust-bors
Copy link

rust-bors bot commented Sep 5, 2025

☀️ Try build successful (CI)
Build commit: bb65748 (bb65748540788cb5fc7be496dc50f9f01a6e73c1, parent: c559c4a741836c4ffa8e4f60cb9fe7e92af5298e)

@bors
Copy link
Collaborator

bors commented Sep 29, 2025

☔ The latest upstream changes (presumably #146513) made this pull request unmergeable. Please resolve the merge conflicts.

@rustbot
Copy link
Collaborator

rustbot commented Sep 29, 2025

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@shepmaster
Copy link
Member Author

@bors2 try jobs=dist-aarch64-apple,dist-x86_64-apple

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Sep 29, 2025
Make macOS dist build configuration match where reasonable

try-job: dist-aarch64-apple
try-job: dist-x86_64-apple
@rust-bors
Copy link

rust-bors bot commented Sep 29, 2025

☀️ Try build successful (CI)
Build commit: 05779f4 (05779f41dd69e210042797ed73fc7d17746d2c6f, parent: 128b36a4a48534b048845cc744b9672529d13df1)

@shepmaster
Copy link
Member Author

Before:

This code, after running a second time to warm the cache... 🥁 🥁 🥁

Seems reasonable to me!

@bors r=@madsmtm rollup

@bors
Copy link
Collaborator

bors commented Sep 29, 2025

📌 Commit 5df0be3 has been approved by madsmtm

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 Sep 29, 2025
bors added a commit that referenced this pull request Sep 30, 2025
Rollup of 4 pull requests

Successful merges:

 - #145883 (Make macOS dist build configuration match where reasonable)
 - #146457 (Skip cleanups on unsupported targets)
 - #147152 (builtin `Fn`-trait impls: instantiate binder before the return type `Sized` check)
 - #147153 ([rustdoc] Move doc cfg propagation pass before items stripping passes)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c3e118b into rust-lang:master Sep 30, 2025
11 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Sep 30, 2025
rust-timer added a commit that referenced this pull request Sep 30, 2025
Rollup merge of #145883 - shepmaster:unify-macos-ci, r=madsmtm

Make macOS dist build configuration match where reasonable

r? `@madsmtm`
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.

4 participants