Fix the merging order updates.pin #3305
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
mzuehlke
force-pushed
the
fix-pin-merging
branch
from
2cd4ab9 to
cf4eb29
Compare
The merging of the default Scala Steward configuration for pinned artifacts was reversed. In contrast to the comment and intend: ```Scala // Strategy: union with repo preference in terms of revision ``` This pull-request fixes the merging order and adapts the test. In addition it adds tests that show how `updates.pin` can be used to control Scala LTS release updates.
mzuehlke
force-pushed
the
fix-pin-merging
branch
from
cf4eb29 to
c926cd6
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3305 +/- ##
=======================================
Coverage 91.18% 91.18%
=======================================
Files 166 166
Lines 3404 3404
Branches 317 317
=======================================
Hits 3104 3104
Misses 300 300 ☔ View full report in Codecov by Sentry. |
alejandrohdezma
approved these changes
Feb 29, 2024
|
Not entirely sure, but I think this change had an unexpected result here. |
#3346 should fix this |
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.
The merging of the default Scala Steward configuration for pinned artifacts was reversed.
In contrast to the comment and intend:
// Strategy: union with repo preference in terms of revisionThis pull-request fixes the merging order and adapts the test. In addition it adds tests that show how
updates.pincan be used to control Scala LTS release updates.Discussed in