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

use workspace inheritance for common version #8925

Merged
merged 1 commit into from
Dec 5, 2023
Merged

Conversation

dead10ck
Copy link
Member

By using the top-level Cargo.toml and workspace inheritance, we can eliminate all the duplication of the version number, and make cargo build report the correct version (rather than the old 0.6.0). This does require adding a patch version to make it semver compatible.

pascalkuthe
pascalkuthe previously approved these changes Nov 27, 2023
Copy link
Member

@pascalkuthe pascalkuthe left a comment

Choose a reason for hiding this comment

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

I would like to see the same thing being done for dependencies too (both so we get a better overview of all external dependencies and avoid duplicate versions) but that can be a separate PR

Copy link
Member

@the-mikedavis the-mikedavis left a comment

Choose a reason for hiding this comment

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

Could you also update the release docs to mention that the version should be bumped in ./Cargo.toml now rather than ./VERSION?

helix/docs/releases.md

Lines 12 to 13 in b7f98d1

* Edit the `VERSION` file and change the date to the next planned release
* Releases are planned to happen every two months, so `22.05` would change to `22.07`

The sub-bullet there could also probably use a bit of rewording, something like: "Releases are planned to happen every few months as time allows. Versions follow CalVer so a release in May of 2022 would be 22.05.0" (Since we'd like to experiment with smaller releases around 1mo and sometimes end up with larger releases more than 3mo.)

helix-loader/build.rs Show resolved Hide resolved
the-mikedavis
the-mikedavis previously approved these changes Nov 27, 2023
Cargo.toml Show resolved Hide resolved
docs/releases.md Outdated Show resolved Hide resolved
@dead10ck
Copy link
Member Author

Ok this was changed to still use the Cargo.toml, but it drops the micro version if it's equal to 0. This will let us track the project version with Cargo, while the user facing version format remains unchanged.

@archseer archseer merged commit bf7c4e1 into master Dec 5, 2023
6 checks passed
@archseer archseer deleted the workspace-version branch December 5, 2023 01:54
evanrichter pushed a commit to evanrichter/helix that referenced this pull request Dec 5, 2023
Desdaemon pushed a commit to Desdaemon/helix that referenced this pull request Dec 11, 2023
dgkf pushed a commit to dgkf/helix that referenced this pull request Jan 30, 2024
mtoohey31 pushed a commit to mtoohey31/helix that referenced this pull request Jun 2, 2024
Vulpesx pushed a commit to Vulpesx/helix that referenced this pull request Jun 7, 2024
smortime pushed a commit to smortime/helix that referenced this pull request Jul 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants