#1355 Fix develop branch config in mainline mode #1371
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
|
@asbjornu can you review this? |
asbjornu
reviewed
Feb 19, 2018
| @@ -109,7 +109,7 @@ public static void ApplyDefaultsTo(Config config) | |||
| new List<string>(), | |||
| defaultTag: "alpha", | |||
| defaultIncrementStrategy: IncrementStrategy.Minor, | |||
| defaultVersioningMode: VersioningMode.ContinuousDeployment, | |||
| defaultVersioningMode: config.VersioningMode == VersioningMode.Mainline? VersioningMode.Mainline : VersioningMode.ContinuousDeployment, | |||
There was a problem hiding this comment.
Why can't defaultVersioningMode always be set to config.VersioningMode?
There was a problem hiding this comment.
Because documentation says that the develop branch is set to ContinuousDeployment mode by default. And all tests require develop branch in ContiniousDeployment mode. But in mainline mode we get wrong behaviour.
|
Can you please do a rebase of this branch on top of the latest |
|
Done. |
|
Excellent, thanks! |
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.
Issue #1355 .
Develop branch is always set in the ContinuousDeployment mode in config and even when we use the Mainline mode. Consequently, we can not get the expected version in the develop branch.
If we try to override branch mode in config, we get an error: "Mainline mode only works at the repository level, a single branch cannot be put into mainline mode..."
By default, all other branches inherit the global mode.