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.

Sign up for GitHub

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

Jump to bottom

Add exclude to config.toml #137147

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add exclude to config.toml #137147

wants to merge 5 commits into from
+46 −16

Conversation

Shourya742
Copy link
Contributor

@Shourya742 Shourya742 commented Feb 16, 2025 •
edited by onur-ozkan
Loading

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
Contributor

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
onur-ozkan reviewed Feb 23, 2025
View reviewed changes
@onur-ozkan
Copy link
Member

@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
Contributor

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
Contributor

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
onur-ozkan
onur-ozkan approved these changes Mar 1, 2025
View reviewed changes
Copy link
Member

@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
Member

@bors r+

@bors
Copy link
Contributor

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 •
edited
Loading

@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
Member

Rebase wasn't required, it was already queued.

Again, @bors r+

@bors
Copy link
Contributor

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 •
edited
Loading

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??

@onur-ozkan
Copy link
Member

We can run try-run jobs but I thought you were confident about the changes. If it fails again, just let me know to test it on that particular job if you are not confident (or if you haven't tested it manually on the platform) to see whether it works or not.

@Shourya742
Copy link
Contributor Author

We can run try-run jobs but I thought you were confident about the changes. If it fails again, just let me know to test it on that particular job if you are not confident (or if you haven't tested it manually on the platform) to see whether it works or not.

I did test it out on system on which it failed earlier, but this time it failed on some other system. Can we try running the changes using the try-run?

@onur-ozkan
Copy link
Member

There is no need to re-run it, as it's already failed.

@bors r-

@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 10, 2025
@Shourya742
Copy link
Contributor Author

There is no need to re-run it, as it's already failed.

@bors r-

I'm aware of the test failure reported in #138255. I pushed commit d07eb8b yesterday specifically to fix that. Can we please check the test results with 'try' now?

@onur-ozkan
Copy link
Member

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2025
@bors
Auto merge of rust-lang#137147 - Shourya742:2025-02-16-support-exclud…
a55c616 
…e-in-config.toml, r=<try>

Add exclude to config.toml

Closes: rust-lang#35678

r? `@onur-ozkan`

try-job: x86_64-msvc-2
@bors
Copy link
Contributor

bors commented Mar 10, 2025

⌛ Trying commit d07eb8b with merge a55c616...

@bors
Copy link
Contributor

bors commented Mar 10, 2025

☀️ Try build successful - checks-actions
Build commit: a55c616 (a55c6168595c8c924ab73fa8fed5344b8fe1ff36)

@onur-ozkan
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 10, 2025

📌 Commit d07eb8b 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 10, 2025
This was referenced Mar 10, 2025
Closed
Open
@jieyouxu
Copy link
Member

@bors r- (conflicts with #137081 I believe)

@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 10, 2025
@jieyouxu
Copy link
Member

@rustbot blocked (#137081 probably should merge first)

@rustbot rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 10, 2025
@jieyouxu
Copy link
Member

Since the other one needs changes, @rustbot ready
@bors r=onur-ozkan

@rustbot rustbot removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Mar 11, 2025
@bors
Copy link
Contributor

bors commented Mar 11, 2025

📌 Commit d07eb8b has been approved by onur-ozkan

It is now in the queue for this repository.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 11, 2025
@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 11, 2025
@jieyouxu jieyouxu mentioned this pull request Mar 11, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2025
@bors
Auto merge of rust-lang#138337 - jieyouxu:rollup-bcp7xvg, r=jieyouxu
8e3b6f6 
Rollup of 18 pull requests

Successful merges:

 - rust-lang#126856 (remove deprecated tool `rls`)
 - rust-lang#137314 (change definitely unproductive cycles to error)
 - rust-lang#137504 (Move methods from Map to TyCtxt, part 4.)
 - rust-lang#137701 (Convert `ShardedHashMap` to use `hashbrown::HashTable`)
 - rust-lang#137967 ([AIX] Fix hangs during testing)
 - rust-lang#138002 (Disable CFI for weakly linked syscalls)
 - rust-lang#138052 (strip `-Wlinker-messages` wrappers from `rust-lld` rmake test)
 - rust-lang#138063 (Improve `-Zunpretty=hir` for parsed attrs)
 - rust-lang#138109 (make precise capturing args in rustdoc Json typed)
 - rust-lang#138147 (Add maintainers for powerpc64le-unknown-linux-gnu)
 - rust-lang#138245 (stabilize `ci_rustc_if_unchanged_logic` test for local environments)
 - rust-lang#138296 (Remove `AdtFlags::IS_ANONYMOUS` and `Copy`/`Clone` condition for anonymous ADT)
 - rust-lang#138300 (add tracking issue for unqualified_local_imports)
 - rust-lang#138307 (Allow specifying glob patterns for try jobs)
 - rust-lang#138313 (Update books)
 - rust-lang#138315 (use next_back() instead of last() on DoubleEndedIterator)
 - rust-lang#138318 (Rustdoc: remove a bunch of `@ts-expect-error` from main.js)
 - rust-lang#138330 (Remove unnecessary `[lints.rust]` sections.)

Failed merges:

 - rust-lang#137147 (Add exclude to config.toml)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@onur-ozkan onur-ozkan onur-ozkan approved these changes

Assignees

@onur-ozkan onur-ozkan

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[rustbuild] Support exclude in config.toml, not just as a flag
5 participants
@Shourya742 @rustbot @bors @onur-ozkan @jieyouxu