Fall back to master if main is missing

[asbjornu]

Fall back to master if main is missing.

Description

Since the default branch was changed from master to main in #2573, some scenarios have stopped working as explained in #2590. This PR attempts to fix that by falling back to master if main is missing. Hopefully, this shouldn't break any existing tests.

Related Issue

Fixes #2590.

Motivation and Context

The change introduced in #2573 wasn't meant to be breaking, so we should do what we can to remedy any breaking it may have lead to.

How Has This Been Tested?

I haven't written any tests for this yet. I'm not sure how to reproduce it, so if all tests are still green I think this should be merged even without a regression test.

Screenshots (if appropriate):

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have added tests to cover my changes.
• All new and existing tests passed.

[asbjornu]

Thinking more about this, why aren't we using the configured branch name regex for the main branch? The main branch could be foobar without breaking, imho.

[asbjornu]

Hm, tests seem to fail at random. I at least don't understand what I've done in the PR which causes the following test to fail in some environments, while being successful in others.

   Shouldly.ShouldAssertException : result.ExitCode
  Failed VerifyAzurePipelinesPullRequest("refs/pull-requests/5/merge") [281 ms]
  Error Message:
    should be
0
    but was
1
  Stack Trace:
     at GitVersion.App.Tests.PullRequestInBuildAgentTest.VerifyPullRequestVersionIsCalculatedProperly(String pullRequestRef, Dictionary`2 env) in /home/runner/work/GitVersion/GitVersion/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs:line 163
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.ThrowForNonSuccess(Task task)
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   at System.Runtime.CompilerServices.TaskAwaiter.GetResult()
   at GitVersion.App.Tests.PullRequestInBuildAgentTest.VerifyAzurePipelinesPullRequest(String pullRequestRef) in /home/runner/work/GitVersion/GitVersion/src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs:line 29
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.ThrowForNonSuccess(Task task)
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   at System.Runtime.CompilerServices.TaskAwaiter.ValidateEnd(Task task)
   at System.Runtime.CompilerServices.TaskAwaiter`1.GetResult()
   at NUnit.Framework.Internal.TaskAwaitAdapter.GenericAdapter`1.GetResult()
   at NUnit.Framework.Internal.AsyncToSyncAdapter.Await(Func`1 invoke)
   at NUnit.Framework.Internal.Commands.TestMethodCommand.RunTestMethod(TestExecutionContext context)
   at NUnit.Framework.Internal.Commands.TestMethodCommand.Execute(TestExecutionContext context)
   at NUnit.Framework.Internal.Execution.SimpleWorkItem.<>c__DisplayClass4_0.<PerformWork>b__0()
   at NUnit.Framework.Internal.ContextUtils.<>c__DisplayClass1_0`1.<DoIsolated>b__0(Object _)
   at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state)
--- End of stack trace from previous location ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state)
   at System.Threading.ExecutionContext.Run(ExecutionContext executionContext, ContextCallback callback, Object state)
   at NUnit.Framework.Internal.ContextUtils.DoIsolated(ContextCallback callback, Object state)
   at NUnit.Framework.Internal.ContextUtils.DoIsolated[T](Func`1 func)
   at NUnit.Framework.Internal.Execution.SimpleWorkItem.PerformWork()

Do you have any ideas, @arturcic?

[arturcic]

Usually these test are failing for the build agents because the environment variables are not properly reset

[asbjornu]

Are the environment variables not reset between different builds, or within the same build? If it's within the same build, is the problem related to parallelization? Can we make the tests execute serially to ensure a proper cleanup between each test execution?

[arturcic]

Are the environment variables not reset between different builds, or within the same build? If it's within the same build, is the problem related to parallelization? Can we make the tests execute serially to ensure a proper cleanup between each test execution?

It needs more investigation

[asbjornu]

Seems like the problem was the following line attempting to resolve Lazy<GitVersionContext>.Value in TrackReleaseBranchesVersionStrategy.ctor:

GitVersion/src/GitVersion.Core/VersionCalculation/BaseVersionCalculators/TrackReleaseBranchesVersionStrategy.cs

Line 38 in 9c7e713

this.configuration = versionContext.Value.Configuration.Configuration;

I've fixed this now by resolving the configuration more lazily inside the MainTagsVersions method and will cherry-pick and push the rest of the commits which I hope will also stay green. 🤞🏼

[mergify]

Thank you @asbjornu for your contribution!