Use the first matched branch configuration #1070
Conversation
| @@ -37,9 +37,6 @@ public class BranchConfigurationCalculator | |||
|
|
|||
| return keyValuePair; | |||
| } | |||
|
|
|||
| const string format = "Multiple branch configurations match the current branch branchName of '{0}'. Matching configurations: '{1}'"; | |||
| throw new Exception(string.Format(format, currentBranch.FriendlyName, string.Join(", ", matchingBranches.Select(b => b.Key)))); | |||
There was a problem hiding this comment.
It would probably be nice to know that there were multiple matches, even though it now doesn't fail.
There was a problem hiding this comment.
I have added a WriteInfo call that will output essentially the old exception message, only now it will specify that it is taking the first configuration and also explicitly state which configuration that is to avoid confusion.
|
I added a simple test to the GitVersionContextTests that creates two release configurations with non-mutually exclusive regex values and test which gets picked among two branches, one of which matches both. |
|
I'm not sure what's causing the error on the Travis CI build. It claims its something wrong with DocumentationSamples.GitHubFlowMajorRelease but there doesn't appear to be much output from the log on that test run. Also the error is Win32Exception: Success? |
|
@cvpcs: I think I have identified the problem in GitTools/GitTools.Core#38. As soon as that's merged, released and upgraded in GitVersion, I hope we can get rid of this and the problem @mkoertgen is having in #720. |
| if (matchingBranches.Length > 1) | ||
| { | ||
| Logger.WriteInfo(string.Format( | ||
| "Multiple branch configurations match the current branch branchName of '{0}'. Using the first matching configuration, '{1}'. Matching configurations include: '{2}'", |
There was a problem hiding this comment.
I think this should probably be a warning..
|
@cvpcs: Can you please have a look at the feedback you've gotten on this PR and rebase it on |
This change causes GitVersion to allow multiple branch configurations to match the current branch, and instead of throwing an exception it will use the first matching configuration that was found.
This adds a test for validating that the first matched branch configuration will be chosen when multiple are present that match the current branch.
cvpcs
force-pushed
the
feature/MatchFirstBranchConfig
branch
from
090ad80 to
832356c
Compare
This change causes GitVersion to allow multiple branch configurations to match the current branch, and instead of throwing an exception it will use the first matching configuration that was found.
Fixes #881