Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

chore: workspace inheritance #29893

Merged
merged 8 commits into from
Feb 23, 2023
Merged

chore: workspace inheritance #29893

merged 8 commits into from
Feb 23, 2023

Conversation

yihau
Copy link
Contributor

@yihau yihau commented Jan 25, 2023 •
edited
Loading

Problem

reopen for #29509 which reverted at #29892

@mergify mergify bot mentioned this pull request Jan 25, 2023
Merged
4 tasks
@yihau yihau force-pushed the cargo-inheritance branch from 53827db to dba262f Compare January 25, 2023 08:28
@yihau
Copy link
Contributor Author

yihau commented Jan 25, 2023

wasm-pack doesn't support workspace inheritance well. I think maybe we can wait for this PR being merged https://www.github.com/rustwasm/wasm-pack/pull/1185

@yihau yihau force-pushed the cargo-inheritance branch 2 times, most recently from 5a06aa5 to 45ad39d Compare January 26, 2023 05:35
@yihau yihau force-pushed the cargo-inheritance branch 2 times, most recently from 4f5c253 to 7e63c12 Compare February 3, 2023 07:05
@github-actions github-actions bot added the stale [bot only] Added to stale content; results in auto-close after a week. label Feb 17, 2023
@yihau yihau removed the stale [bot only] Added to stale content; results in auto-close after a week. label Feb 18, 2023
@yihau yihau force-pushed the cargo-inheritance branch from 7e63c12 to b5c0fdd Compare February 18, 2023 03:00
@yihau yihau mentioned this pull request Feb 18, 2023
Merged
@yihau yihau force-pushed the cargo-inheritance branch 2 times, most recently from f529900 to 8176e3d Compare February 22, 2023 05:41
@yihau yihau marked this pull request as ready for review February 22, 2023 07:24
@yihau yihau requested a review from steviez February 22, 2023 07:24
@yihau
Copy link
Contributor Author

yihau commented Feb 22, 2023

the wasm test passed. this one should be fine to merge again 🪖

steviez
steviez previously approved these changes Feb 22, 2023
View reviewed changes
Copy link
Contributor

@steviez steviez left a comment

Choose a reason for hiding this comment

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

Same as before, I ran cargo tree on tip of master and this branch, and observed no difference in the generated output.

@yihau yihau force-pushed the cargo-inheritance branch from 8176e3d to 4e16f8f Compare February 23, 2023 06:39
@yihau
Copy link
Contributor Author

yihau commented Feb 23, 2023

there are some conflicts when I would like to merge this one 😢 @steviez could you take another look at this PR please. thank you!

@yihau yihau merged commit df3ef11 into solana-labs:master Feb 23, 2023
@CriesofCarrots CriesofCarrots mentioned this pull request Feb 23, 2023
Merged
@solana-labs solana-labs deleted a comment from jamesmichaeltate1 Mar 2, 2023
@behzadnouri behzadnouri mentioned this pull request Mar 28, 2023
Merged
@andreisilviudragnea andreisilviudragnea mentioned this pull request Aug 18, 2023
Closed
@CriesofCarrots CriesofCarrots mentioned this pull request Aug 29, 2023
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@steviez steviez steviez approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yihau @steviez