Merge branch 'hotfix/1.1.2'

* hotfix/1.1.2: (GH-528) Fix syntax errors (GH-528) Update Teardown method (maint) Remove whitespace (maint) Ignore files on Mac
cake-contrib · Jul 15, 2020 · 42fa2c6 · 42fa2c6
2 parents 07bac31 + 111bd69
commit 42fa2c6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -264,4 +264,8 @@ docs/input/tasks/*
 # Wyam related
 docs/config.wyam.dll
 docs/config.wyam.hash
-docs/config.wyam.packages.xml
+docs/config.wyam.packages.xml
+
+*.orig
+
+.DS_Store
diff --git a/Cake.Recipe/Content/build.cake b/Cake.Recipe/Content/build.cake
@@ -50,7 +50,14 @@ Teardown(context =>
 
  if(context.Successful)
  {
- if(!BuildParameters.IsLocalBuild && !BuildParameters.IsPullRequest && BuildParameters.IsMainRepository && (BuildParameters.IsMasterBranch || ((BuildParameters.IsReleaseBranch || BuildParameters.IsHotFixBranch) && BuildParameters.ShouldNotifyBetaReleases)) && BuildParameters.IsTagged)
+ if(!BuildParameters.IsLocalBuild &&
+ !BuildParameters.IsPullRequest &&
+ BuildParameters.IsMainRepository &&
+ (BuildParameters.IsMasterBranch ||
+ ((BuildParameters.IsReleaseBranch || BuildParameters.IsHotFixBranch)
+ && BuildParameters.ShouldNotifyBetaReleases)) &&
+ BuildParameters.IsTagged &&
+ !BuildParameters.IsRunningIntegrationTests)
  {
  if(BuildParameters.CanPostToTwitter && BuildParameters.ShouldPostToTwitter)
  {
@@ -70,7 +77,9 @@ Teardown(context =>
  }
  else
  {
- if(!BuildParameters.IsLocalBuild && BuildParameters.IsMainRepository)
+ if(!BuildParameters.IsLocalBuild &&
+ BuildParameters.IsMainRepository &&
+ !BuildParameters.IsRunningIntegrationTests)
  {
  if(BuildParameters.CanPostToSlack && BuildParameters.ShouldPostToSlack)
  {

diff --git a/Cake.Recipe/Content/parameters.cake b/Cake.Recipe/Content/parameters.cake
@@ -30,6 +30,14 @@ public static class BuildParameters
  public static string MasterBranchName { get; private set; }
  public static string DevelopBranchName { get; private set; }
 
+ public static bool IsRunningIntegrationTests
+ {
+ get
+ {
+ return string.Equals(BuildParameters.Target, "Run-Integration-Tests", StringComparison.OrdinalIgnoreCase);
+ }
+ }
+
  public static string GitterMessage
  {
  get

diff --git a/Cake.Recipe/Content/testing.cake b/Cake.Recipe/Content/testing.cake
@@ -214,10 +214,10 @@ BuildParameters.Tasks.DotNetCoreTestTask = Task("DotNetCore-Test")
 BuildParameters.Tasks.IntegrationTestTask = Task("Run-Integration-Tests")
  .WithCriteria(() => BuildParameters.ShouldRunIntegrationTests)
  .IsDependentOn("Default")
- .Does(() => 
+ .Does(() =>
  {
  CakeExecuteScript(BuildParameters.IntegrationTestScriptPath,
- new CakeSettings 
+ new CakeSettings
  {
  Arguments = new Dictionary<string, string>
  {