Update build scripts to account for master branch having been renamed…

… to main
Jericho · Jun 30, 2020 · dbcb629 · dbcb629
1 parent aab2544
commit dbcb629
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,5 +1,12 @@
 mode: ContinuousDelivery
 branches:
+  master:
+    regex: main
+    mode: ContinuousDelivery
+    tag:
+    increment: Patch
+    prevent-increment-of-merged-branch-version: true
+    track-merge-target: false
   feature:
     regex: feature(s)?[/-]
     mode: ContinuousDeployment

diff --git a/build.cake b/build.cake
@@ -58,7 +58,7 @@ var versionInfo = GitVersion(new GitVersionSettings() { OutputType = GitVersionO
 var milestone = versionInfo.MajorMinorPatch;
 var cakeVersion = typeof(ICakeContext).Assembly.GetName().Version.ToString();
 var isLocalBuild = BuildSystem.IsLocalBuild;
-var isMainBranch = StringComparer.OrdinalIgnoreCase.Equals("master", BuildSystem.AppVeyor.Environment.Repository.Branch);
+var isMainBranch = StringComparer.OrdinalIgnoreCase.Equals("main", BuildSystem.AppVeyor.Environment.Repository.Branch);
 var isMainRepo = StringComparer.OrdinalIgnoreCase.Equals($"{gitHubRepoOwner}/{gitHubRepo}", BuildSystem.AppVeyor.Environment.Repository.Name);
 var isPullRequest = BuildSystem.AppVeyor.Environment.PullRequest.IsPullRequest;
 var isTagged = (
@@ -335,7 +335,7 @@ Task("Create-Release-Notes")
 		Name              = milestone,
 		Milestone         = milestone,
 		Prerelease        = false,
-		TargetCommitish   = "master"
+		TargetCommitish   = "main"
 	};
 
 	if (!string.IsNullOrEmpty(gitHubToken))
@@ -364,7 +364,7 @@ Task("Publish-GitHub-Release")
 		Name              = milestone,
 		Milestone         = milestone,
 		Prerelease        = false,
-		TargetCommitish   = "master"
+		TargetCommitish   = "main"
 	};
 
 	if (!string.IsNullOrEmpty(gitHubToken))