Fix our continuous pre-releases #1458
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
emilk
added
🧑💻 dev experience
emilk
commented
Mar 1, 2023
| @@ -0,0 +1,267 @@ | |||
| /// We disallow version numbers larger than this in order to keep a few bits for future use. | |||
There was a problem hiding this comment.
Most of the following is old code, but I renamed the file, and git failed to figure that one out 😭
emilk
commented
Mar 1, 2023
| @@ -90,8 +90,7 @@ def main() -> None: | |||
| cargo_version = get_cargo_version(cargo_toml) | |||
|
|
|||
| if sys.argv[1] == "--patch_prerelease": | |||
| git_sha = get_git_sha() | |||
| new_version = cargo_version.bump_build(git_sha) | |||
| new_version = f"{cargo_version}+{get_git_sha()}" | |||
There was a problem hiding this comment.
Small change here: the old code would suffix with +GITHASH.1. The new code just adds +GITHASH.
jleibs
approved these changes
Mar 1, 2023
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.
Closes #1457
Summary
Ignore the
+{$GITHASH}suffix (that we use for our continuous releases) when parsing rust crate version.Details
We use
-alpha.X-suffixes when we do intentional pre-releases, published tocrates.ioandPyPI.We also do continuous releases of wheel on each merge to
main. These are distinguished by suffixing our version string with+{$GITHASH}.This caused issues when trying to parse the crate versions (at compile time). With this PR, we now ignore that suffix.
Why not parse it?
The
+build-metadatasuffixes of semver are not part of the actual version. It is metadata.We use the crate version to version our .rrd files, and so we should ignore metadata for that anyway.
We still show the git hash with
rerun --version, and include it in our analytics.Checklist