Merge branch 'hotfix/0.28.3'

* hotfix/0.28.3: (#154) Verify PowerShell scripts on develop branch
chocolatey · May 17, 2024 · 7fe3b3d · 7fe3b3d
2 parents 173591a + ae80816
commit 7fe3b3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Chocolatey.Cake.Recipe/Content/parameters.cake b/Chocolatey.Cake.Recipe/Content/parameters.cake
@@ -19,7 +19,8 @@ public enum BranchType
     HotFix,
     Release,
     Develop,
-    Master
+    Master,
+    Support
 }
 
 public static class BuildParameters
@@ -870,6 +871,10 @@ public static class BuildParameters
         {
             BranchType = BranchType.HotFix;
         }
+        else if (branchName != null && branchName.StartsWith("support", StringComparison.OrdinalIgnoreCase))
+        {
+            BranchType = BranchType.Support;
+        }
         else
         {
             BranchType = BranchType.Unknown;

diff --git a/Chocolatey.Cake.Recipe/Content/sign.cake b/Chocolatey.Cake.Recipe/Content/sign.cake
@@ -16,7 +16,7 @@
 BuildParameters.Tasks.VerifyPowerShellScriptsTask = Task("Verify-PowerShellScripts")
     .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping due to not running on Windows")
     .WithCriteria(() => !BuildParameters.IsPullRequest, "Skipping because current build is from a Pull Request")
-    .WithCriteria(() => BuildParameters.BranchType == BranchType.Master || BuildParameters.BranchType == BranchType.Release || BuildParameters.BranchType == BranchType.HotFix, "Skipping because this is not a releasable branch")
+    .WithCriteria(() => BuildParameters.BranchType == BranchType.Master || BuildParameters.BranchType == BranchType.Release || BuildParameters.BranchType == BranchType.HotFix || BuildParameters.BranchType == BranchType.Support || BuildParameters.BranchType == BranchType.Develop, "Skipping because this is not a 'main' branch, i.e. master, develop, release, hotfix, or support, where scripts need to be verified.")
     .WithCriteria(() => BuildParameters.ShouldVerifyPowerShellScripts, "Skipping since verifying PowerShell scripts has been disabled")
     .Does(() =>
 {