Skip to content

Commit

Permalink
Merge pull request #322 from WildGums/GitHubSync/20210210-095751
Browse files Browse the repository at this point in the history
GitHubSync update
  • Loading branch information
GeertvanHorrik committed Feb 10, 2021
2 parents 04eaa12 + 80f04e9 commit d2c69b6
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 34 deletions.
23 changes: 0 additions & 23 deletions .github/workflows/cake-buildscripts-dependabot.yml

This file was deleted.

9 changes: 5 additions & 4 deletions deployment/cake/dependencies-tasks.cake
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ public class DependenciesProcessor : ProcessorBase
// is required to prevent issues with foreach
foreach (var dependency in BuildContext.Dependencies.Items.ToList())
{
if (!ShouldProcessProject(BuildContext, dependency))
{
BuildContext.Dependencies.Items.Remove(dependency);
}
// Note: dependencies should always be built
// if (!ShouldProcessProject(BuildContext, dependency))
// {
// BuildContext.Dependencies.Items.Remove(dependency);
// }
}
}

Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/generic-variables.cake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#l "buildserver.cake"

#tool "nuget:?package=GitVersion.CommandLine&version=5.6.4"
#tool "nuget:?package=GitVersion.CommandLine&version=5.6.6"

//-------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/github-pages-tasks.cake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#l "github-pages-variables.cake"

#addin "nuget:?package=Cake.Git&version=0.22.0"
#addin "nuget:?package=Cake.Git&version=1.0.0"

//-------------------------------------------------------------

Expand Down
6 changes: 3 additions & 3 deletions deployment/cake/lib-generic.cake
Original file line number Diff line number Diff line change
Expand Up @@ -518,14 +518,14 @@ private static bool ShouldProcessProject(BuildContext buildContext, string proje

// Experimental mode where we ignore projects that are not on the deploy list when not in CI mode, but
// it can only work if they are not part of unit tests (but that should never happen)
if (buildContext.Tests.Items.Count == 0)
{
// if (buildContext.Tests.Items.Count == 0)
// {
if (checkDeployment && !ShouldDeployProject(buildContext, projectName))
{
buildContext.CakeContext.Warning("Project '{0}' should not be processed because this is not a CI build, does not contain tests and the project should not be deployed, removing from projects to process", projectName);
return false;
}
}
//}

return true;
}
Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/lib-octopusdeploy.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#tool "nuget:?package=OctopusTools&version=7.4.4"
#tool "nuget:?package=OctopusTools&version=7.4.6"

public class OctopusDeployIntegration : IntegrationBase
{
Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/notifications-msteams.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#addin "nuget:?package=Cake.MicrosoftTeams&version=0.9.0"
#addin "nuget:?package=Cake.MicrosoftTeams&version=1.0.0"

//-------------------------------------------------------------

Expand Down

0 comments on commit d2c69b6

Please sign in to comment.