fix: consider all 'devel' builds as 'dev' builds #9794
Merged
Conversation
This file contains hidden or 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
If CI needs to be distinguished from a dev build, we should add a different pre-release tag for those builds.
mafredri
reviewed
Sep 20, 2023
buildinfo/buildinfo.go
Outdated
| @@ -65,16 +73,21 @@ func Version() string { | |||
| func VersionsMatch(v1, v2 string) bool { | |||
| // Developer versions are disregarded...hopefully they know what they are | |||
| // doing. | |||
| if strings.HasPrefix(v1, develPrefix) || strings.HasPrefix(v2, develPrefix) { | |||
| if IsDevVersion(v1) || IsDevVersion(v2) { | |||
There was a problem hiding this comment.
I think this logic made sense for v0.0.0, but for non-v0.0.0 we know approximately the version in question and we could require the minor version match. Or is there a use-case for returning a match for e.g. v1.1.1-devel and v1.2.3 as tested below?
There was a problem hiding this comment.
I was thinking along the same lines. I will change it so only v0.0.0 matches all, and other versions do check major minor as expected.
There was a problem hiding this comment.
This should be pretty much the previous behavior.
Emyrk
commented
Sep 25, 2023
Comment on lines
73
to
77
| func VersionsMatch(v1, v2 string) bool { | ||
| // Developer versions are disregarded...hopefully they know what they are | ||
| // doing. | ||
| if IsDevVersion(v1) || IsDevVersion(v2) { | ||
| // If no version is attached, then it is a dev build outside of CI. The version | ||
| // will be disregarded... hopefully they know what they are doing. | ||
| if strings.Contains(v1, noVersion) || strings.Contains(v2, noVersion) { | ||
| return true |
There was a problem hiding this comment.
This should match the old behavior now @mafredri
mafredri
approved these changes
Sep 25, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
If CI needs to be distinguished from a dev build, we should add a different pre-release tag for those builds.