Improve cargo workspace #330
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LGFae
reviewed
Jun 18, 2024
Cargo.toml
Outdated
| @@ -1,14 +1,30 @@ | |||
| [workspace] | |||
| members = [".", "daemon", "utils"] | |||
| default-members = [".", "daemon"] | |||
| resolver = "2" | |||
There was a problem hiding this comment.
This is unnecessary, since the 2021 edition already uses resolver 2.
version.sh
Outdated
Comment on lines
21
to
36
| # Cargo.toml: | ||
| sed \ | ||
| -e "s/^version = .*/version = \"$1\"/" \ | ||
| -e "s/^utils.*/utils = { version = \"$1\", path = \"utils\" }/" \ | ||
| -e "s/^common.*/common = { version = \"$1\", path = \"common\" }/" \ | ||
| Cargo.toml > TMP | ||
| mv -v TMP Cargo.toml | ||
|
|
||
| sed "s/^version = .*/version = \"$1\"/" utils/Cargo.toml > TMP | ||
| mv -v TMP utils/Cargo.toml | ||
| sed "s/^version = .*/version = \"$1\"/" common/Cargo.toml > TMP | ||
| mv -v TMP common/Cargo.toml | ||
|
|
||
| sed \ | ||
| -e "s/^version = .*/version = \"$1\"/" \ | ||
| -e "s/^utils.*/utils = { version = \"$1\", path = \"..\/utils\" }/" \ | ||
| -e "s/^common.*/common = { version = \"$1\", path = \"..\/common\" }/" \ | ||
| daemon/Cargo.toml > TMP | ||
| mv -v TMP daemon/Cargo.toml | ||
|
|
There was a problem hiding this comment.
These were updating the versions in every crate. Since now there is only one global one, you just need
sed -e "s/^version = .*/version = \"$1\"/" Cargo.toml > TMP
mv -v TMP Cargo.toml
|
Be right back |
|
Very nice. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I moved swww client to separate directory and renamed utils to more intuitive common