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

fix(embedded): Don't auto-discover build.rs files #12283

Merged
merged 2 commits into from
Jun 17, 2023
Merged

Conversation

epage
Copy link
Contributor

@epage epage commented Jun 17, 2023

With #12268, we moved the manifest root to be the scripts parent
directory, making it so auto-discovery might pick some things up.

We previously ensured auto* don't pick things up but missed build.rs
This is now addressed.

With rust-lang#12268, we moved the manifest root to be the scripts parent
directory, making it so auto-discovery might pick some things up.

We previously ensured `auto*` don't pick things up but missed `build.rs`
This is now addressed.
@rustbot
Copy link
Collaborator

rustbot commented Jun 17, 2023

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 17, 2023
@weihanglo
Copy link
Member

Thanks for the extremely quick fix!!

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 17, 2023

📌 Commit f8325ac has been approved by weihanglo

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 Jun 17, 2023
@bors
Copy link
Collaborator

bors commented Jun 17, 2023

⌛ Testing commit f8325ac with merge 3b23475...

bors added a commit that referenced this pull request Jun 17, 2023
fix(embedded): Don't auto-discover build.rs files

With #12268, we moved the manifest root to be the scripts parent
directory, making it so auto-discovery might pick some things up.

We previously ensured `auto*` don't pick things up but missed `build.rs`
This is now addressed.
@epage
Copy link
Contributor Author

epage commented Jun 17, 2023

Of course the one time I don't run more tests, I get a failure...

@weihanglo
Copy link
Member

Also my fault. I hadn't thought of that.

Feel free to r=weihanglo if there are more tests need to be fixed 🤪.

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 17, 2023

📌 Commit 3f93030 has been approved by weihanglo

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Jun 17, 2023

⌛ Testing commit 3f93030 with merge e518f7c...

@bors
Copy link
Collaborator

bors commented Jun 17, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing e518f7c to master...

@bors bors merged commit e518f7c into rust-lang:master Jun 17, 2023
18 checks passed
@epage epage deleted the build branch June 17, 2023 19:58
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2023
Update cargo

12 commits in 0c14026aa84ee2ec4c67460c0a18abc8519ca6b2..dead4b8740c4b6a8ed5211e37c99cf81d01c3b1c
2023-06-14 18:43:05 +0000 to 2023-06-20 20:07:17 +0000
- Convert valid feature name warning to an error. (rust-lang/cargo#12291)
- fix(embedded): Don't pollute script dir with lockfile (rust-lang/cargo#12284)
- fix: remove `-Zjobserver-per-rustc` again (rust-lang/cargo#12285)
- docs: some tweaks around `cargo test` (rust-lang/cargo#12288)
- Enable `doctest-in-workspace` by default (rust-lang/cargo#12221)
- fix(embedded): Don't auto-discover build.rs files (rust-lang/cargo#12283)
- fix(embeded): Don't pollute the scripts dir with `target/` (rust-lang/cargo#12282)
- feat: prepare for the next lockfile bump (rust-lang/cargo#12279)
- fix(embedded): Don't create an intermediate manifest (rust-lang/cargo#12268)
- refactor(embedded): Switch to `syn` for parsing doc comments (rust-lang/cargo#12258)
- fix(embedded): Align package name sanitization with cargo-new (rust-lang/cargo#12255)
- Clarify the default behavior of cargo-install. (rust-lang/cargo#12276)

r? `@ghost`
@ehuss ehuss added this to the 1.72.0 milestone Jun 22, 2023
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