[builder] only compare major and minor versions from gomod #9997
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #9997 +/- ##
==========================================
- Coverage 91.77% 91.67% -0.11%
==========================================
Files 360 360
Lines 16635 16639 +4
==========================================
- Hits 15267 15253 -14
- Misses 1041 1052 +11
- Partials 327 334 +7 ☔ View full report in Codecov by Sentry. |
| @@ -167,7 +168,7 @@ func GetModules(cfg Config) error { | |||
| if !ok { | |||
| return fmt.Errorf("core collector %w: '%s'. %s", ErrDepNotFound, corePath, skipStrictMsg) | |||
| } | |||
| if coreDepVersion != coreVersion { | |||
| if semver.MajorMinor(coreDepVersion) != semver.MajorMinor(coreVersion) { | |||
There was a problem hiding this comment.
I think this should be alright, but could we use semver.Compare here?
There was a problem hiding this comment.
semver.Compare includes the patch version in its comparison, but my goal is to allow patch versions to be different.
|
Talked to @codeboten and I think we still need this 😅 |
added 2 commits
April 19, 2024 11:58
codeboten
approved these changes
Apr 19, 2024
|
Merging this will unblock updating contrib to the latest core deps. |
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.
Description
When building from a commit hash, I got this error:
It may be more useful to only compare the major and minor versions
Link to tracking issue
#9896
Found in open-telemetry/opentelemetry-collector-contrib#32544
Testing
Documentation
updated readme