Skip to content

Conversation

@Shourya742
Copy link
Contributor

@Shourya742 Shourya742 commented Feb 16, 2025

Closes: #35678

r? @onur-ozkan

try-job: x86_64-msvc-2

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 16, 2025
@rustbot
Copy link
Collaborator

rustbot commented Feb 16, 2025

This PR modifies config.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from e9a9186 to 2bf009d Compare February 16, 2025 20:06
@bors
Copy link
Collaborator

bors commented Feb 18, 2025

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

@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from 2bf009d to 471069b Compare February 19, 2025 02:42
@onur-ozkan
Copy link
Contributor

@rustbot author

@rustbot rustbot 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 Feb 23, 2025
@bors
Copy link
Collaborator

bors commented Feb 23, 2025

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

@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from 471069b to daf8f8d Compare February 23, 2025 16:48
@Shourya742
Copy link
Contributor Author

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 24, 2025
@bors
Copy link
Collaborator

bors commented Feb 25, 2025

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

@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from daf8f8d to a110552 Compare February 27, 2025 14:47
Copy link
Contributor

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

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

LGTM

@onur-ozkan
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 1, 2025

📌 Commit a110552 has been approved by onur-ozkan

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 Mar 1, 2025
@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from a110552 to 9206960 Compare March 1, 2025 07:21
@Shourya742
Copy link
Contributor Author

Shourya742 commented Mar 1, 2025

@rustbot review
cc: @onur-ozkan

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2025
@onur-ozkan
Copy link
Contributor

Rebase wasn't required, it was already queued.

Again, @bors r+

@bors
Copy link
Collaborator

bors commented Mar 1, 2025

📌 Commit 9206960 has been approved by onur-ozkan

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2025
@Shourya742
Copy link
Contributor Author

Shourya742 commented Mar 1, 2025

Rebase wasn't required, it was already queued.

Again, @bors r+

I saw change_tracker conflicts on github, so thought of rebasing on latest changes on master. Does bors resolve merge conflicts??

@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 12, 2025
@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from d07eb8b to de54712 Compare March 12, 2025 03:04
@Shourya742
Copy link
Contributor Author

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 12, 2025
@bors
Copy link
Collaborator

bors commented Mar 13, 2025

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

@Shourya742 Shourya742 force-pushed the 2025-02-16-support-exclude-in-config.toml branch from de54712 to c6ecd8c Compare March 13, 2025 16:08
@onur-ozkan
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 15, 2025

📌 Commit c6ecd8c has been approved by onur-ozkan

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 Mar 15, 2025
@bors bors merged commit b8c51f4 into rust-lang:master Mar 16, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 16, 2025
ChangeInfo {
change_id: 137147,
severity: ChangeSeverity::Info,
summary: "New option `build.exclude` that adds support for excluding test.",
Copy link
Member

Choose a reason for hiding this comment

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

This should say "excluding tests", right?

Copy link
Contributor

@onur-ozkan onur-ozkan Mar 17, 2025

Choose a reason for hiding this comment

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

Also, it's not just for tests. I missed this. I will send a follow-up PR.

PR: #138592

@Shourya742 Shourya742 deleted the 2025-02-16-support-exclude-in-config.toml branch March 29, 2025 01:28
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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[rustbuild] Support exclude in config.toml, not just as a flag

6 participants