Restore pre-0.25 nested layers compatibility #596
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
jkloetzke
force-pushed
the
layer-compat
branch
from
eab47b9 to
55308d0
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #596 +/- ##
==========================================
- Coverage 88.90% 88.89% -0.01%
==========================================
Files 48 48
Lines 15341 15360 +19
==========================================
+ Hits 13639 13655 +16
- Misses 1702 1705 +3 ☔ View full report in Codecov by Sentry. |
The bob.input.Recipe.getLayer() method returns a list. This was changed inadvertently in 6f84d58 to return just a string. As the method is part of the public plugin API, we'd better keep it that way, even if the list will only have one element at most.
Historically, layers could be nested where they would form a tree structure. This has been removed with the introduction of managed layers in f70beb1. Turns out, this was a bit optimistic because there are existing projects that rely on this. To bring back the old behaviour, add the managedLayers policy. If the policy is on the old behaviour, nested layers are supported. To keep things simple, any managed layer will be rejected in this case. If the managedLayers policy is set to the new behaviour, all layers will be placed flat in the project- resp. build-directory. Fixes BobBuildTool#595.
If the managedLayers policy is set to the old behaviour, we already refuse to parse projects that use layer SCMs. Also do this for the "bob layers" command for a consistent behaviour.
jkloetzke
force-pushed
the
layer-compat
branch
from
55308d0 to
d4dad4b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Add the managedLayers policy for backwards compatibility.
Fixes #595.