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

handle the case when the change-id isn't found #117263

Merged
merged 3 commits into from Nov 8, 2023

Conversation

onur-ozkan
Copy link
Member

When we switch back and forth between the old and recent branches, if there was a breaking change in the bootstrap configuration in between, we have to update the change-id in the build configuration with each checkout, which can be exhausting. This change fixes that.

r? saethlin

@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 Oct 27, 2023
@onur-ozkan
Copy link
Member Author

-kindly reminder ping- @saethlin

src/bootstrap/src/lib.rs Outdated Show resolved Hide resolved
@saethlin
Copy link
Member

saethlin commented Nov 4, 2023

Thanks for reminding me, this PR fell out of my work queue. The new warning looks good, just if I understand the implementation of find_recent_config_change_ids correctly, it could be a lot smaller.

@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 Nov 4, 2023
@onur-ozkan onur-ozkan 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 Nov 6, 2023
@saethlin
Copy link
Member

saethlin commented Nov 7, 2023

r=me when you resolve the conflicts, thanks for being so patient with me :)

@onur-ozkan
Copy link
Member Author

@bors r=saethlin rollup

@bors
Copy link
Contributor

bors commented Nov 8, 2023

📌 Commit 966c102 has been approved by saethlin

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 Nov 8, 2023
fmease added a commit to fmease/rust that referenced this pull request Nov 8, 2023
handle the case when the change-id isn't found

When we switch back and forth between the old and recent branches, if there was a breaking change in the bootstrap configuration in between, we have to update the change-id in the build configuration with each checkout, which can be exhausting. This change fixes that.

r? saethlin
@bors
Copy link
Contributor

bors commented Nov 8, 2023

☔ The latest upstream changes (presumably #116881) made this pull request unmergeable. Please resolve the 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 Nov 8, 2023
When we switch back and forth between the old and recent branches,
if there was a breaking change in the bootstrap configuration in
between, we have to update the change-id in the build configuration
with each checkout, which can be exhausting. This change fixes that.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Member Author

@bors r=saethlin

@bors
Copy link
Contributor

bors commented Nov 8, 2023

📌 Commit e0cb1cc has been approved by saethlin

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 Nov 8, 2023
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 8, 2023
handle the case when the change-id isn't found

When we switch back and forth between the old and recent branches, if there was a breaking change in the bootstrap configuration in between, we have to update the change-id in the build configuration with each checkout, which can be exhausting. This change fixes that.

r? saethlin
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2023
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#117263 (handle the case when the change-id isn't found)
 - rust-lang#117282 (Recover from incorrectly ordered/duplicated function keywords)
 - rust-lang#117679 (tests/rustdoc-json: Avoid needless use of `no_core` and `lang_items`)
 - rust-lang#117702 (target: move base and target specifications)
 - rust-lang#117713 (Add test for reexported hidden item with `--document-hidden-items`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e05e4f3 into rust-lang:master Nov 8, 2023
11 checks passed
@rustbot rustbot added this to the 1.75.0 milestone Nov 8, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2023
Rollup merge of rust-lang#117263 - onur-ozkan:change-id-fix, r=saethlin

handle the case when the change-id isn't found

When we switch back and forth between the old and recent branches, if there was a breaking change in the bootstrap configuration in between, we have to update the change-id in the build configuration with each checkout, which can be exhausting. This change fixes that.

r? saethlin
@onur-ozkan onur-ozkan deleted the change-id-fix branch January 27, 2024 09:23
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.

None yet

4 participants