Skip to content

Commit 7fe3b3d

Browse files
committed
Merge branch 'hotfix/0.28.3'
* hotfix/0.28.3: (#154) Verify PowerShell scripts on develop branch
2 parents 173591a + ae80816 commit 7fe3b3d

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Chocolatey.Cake.Recipe/Content/parameters.cake

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public enum BranchType
1919
HotFix,
2020
Release,
2121
Develop,
22-
Master
22+
Master,
23+
Support
2324
}
2425

2526
public static class BuildParameters
@@ -870,6 +871,10 @@ public static class BuildParameters
870871
{
871872
BranchType = BranchType.HotFix;
872873
}
874+
else if (branchName != null && branchName.StartsWith("support", StringComparison.OrdinalIgnoreCase))
875+
{
876+
BranchType = BranchType.Support;
877+
}
873878
else
874879
{
875880
BranchType = BranchType.Unknown;

Chocolatey.Cake.Recipe/Content/sign.cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
BuildParameters.Tasks.VerifyPowerShellScriptsTask = Task("Verify-PowerShellScripts")
1717
.WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping due to not running on Windows")
1818
.WithCriteria(() => !BuildParameters.IsPullRequest, "Skipping because current build is from a Pull Request")
19-
.WithCriteria(() => BuildParameters.BranchType == BranchType.Master || BuildParameters.BranchType == BranchType.Release || BuildParameters.BranchType == BranchType.HotFix, "Skipping because this is not a releasable branch")
19+
.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.")
2020
.WithCriteria(() => BuildParameters.ShouldVerifyPowerShellScripts, "Skipping since verifying PowerShell scripts has been disabled")
2121
.Does(() =>
2222
{

0 commit comments

Comments
 (0)