diff --git a/Cake.Recipe/Cake.Recipe.nuspec b/Cake.Recipe/Cake.Recipe.nuspec index 3f1e7b6b..668cf9ed 100644 --- a/Cake.Recipe/Cake.Recipe.nuspec +++ b/Cake.Recipe/Cake.Recipe.nuspec @@ -11,7 +11,7 @@ This NuGet package contains a set of re-usable scripts that can be added to your https://cake-contrib.github.io/Cake.Recipe/docs/ -NOTE: Currently, Cake.Recipe itself is built using 0.32.1, and as a result, there is an expectation that that any project that is built using Cake.Recipe should also use 0.32.1 of Cake. Currently, attempting to build your project using 0.33.0 will result in errors which come from Cake.Recipe. +NOTE: Currently, Cake.Recipe itself is built using 0.38.4, and as a result, there is an expectation that that any project that is built using Cake.Recipe should also use 0.38.4 of Cake. Using a newer version of Cake may work, but there is no guarantee that it will. MIT https://github.com/cake-contrib/Cake.Recipe/ diff --git a/Cake.Recipe/Content/packages.cake b/Cake.Recipe/Content/packages.cake index 25470c65..d2537608 100644 --- a/Cake.Recipe/Content/packages.cake +++ b/Cake.Recipe/Content/packages.cake @@ -281,9 +281,13 @@ public void PushNuGetPackages(ICakeContext context, bool isRelease, List redirectedStandardOutput; + IEnumerable redirectedError; + + var exitCode = context.StartProcess( + gitTool, + new ProcessSettings { + Arguments = "branch --contains HEAD", + RedirectStandardOutput = true, + RedirectStandardError = true, + }, + out redirectedStandardOutput, + out redirectedError + ); + + if (exitCode == 0) + { + var lines = redirectedStandardOutput.Select(c => c.TrimStart(new []{ ' ', '*' })).ToList(); + + if (lines.Contains(masterBranchName)) + { + BranchType = BranchType.Master; + } + else if (lines.Contains(developBranchName)) + { + BranchType = BranchType.Develop; + } + else if (lines.Any(l => l.StartsWith("release", StringComparison.OrdinalIgnoreCase))) + { + BranchType = BranchType.Release; + } + else if (lines.Any(l => l.StartsWith("hotfix", StringComparison.OrdinalIgnoreCase))) + { + BranchType = BranchType.HotFix; + } + } + } + } else { BranchType = BranchType.Unknown; } - IsTagged = ( - BuildProvider.Repository.Tag.IsTag && - !string.IsNullOrWhiteSpace(BuildProvider.Repository.Tag.Name) - ); TreatWarningsAsErrors = treatWarningsAsErrors; GitHub = GetGitHubCredentials(context); diff --git a/GitReleaseManager.yaml b/GitReleaseManager.yaml index 721c1ba4..d5324521 100644 --- a/GitReleaseManager.yaml +++ b/GitReleaseManager.yaml @@ -9,4 +9,19 @@ issue-labels-exclude: issue-labels-alias: - name: Documentation header: Documentation - plural: Documentation \ No newline at end of file + plural: Documentation +create: + include-sha-section: true + sha-section-heading: "SHA256 Hashes of the release artifacts" + sha-section-line-format: "- `{1}\t{0}`" +close: + use-issue-comments: true + issue-comment: |- + :tada: This issue has been resolved in version {milestone} :tada: + + The release is available on: + + - [GitHub Release](https://github.com/{owner}/{repository}/releases/tag/{milestone}) + - [NuGet Package](https://www.nuget.org/packages/{repository}/{milestone}) + + Your **[GitReleaseManager](https://github.com/GitTools/GitReleaseManager)** bot :package::rocket: \ No newline at end of file diff --git a/recipe.cake b/recipe.cake index bd853cd5..1130d469 100644 --- a/recipe.cake +++ b/recipe.cake @@ -9,13 +9,17 @@ public class BuildMetaData Environment.SetVariableNames(); +var standardNotificationMessage = "Version {0} of {1} has just been released, this will be available here https://www.nuget.org/packages/{1}, once package indexing is complete."; + BuildParameters.SetParameters(context: Context, buildSystem: BuildSystem, sourceDirectoryPath: "./src", title: "Cake.Recipe", repositoryOwner: "cake-contrib", repositoryName: "Cake.Recipe", - appVeyorAccountName: "cakecontrib"); + appVeyorAccountName: "cakecontrib", + gitterMessage: "@/all " + standardNotificationMessage, + twitterMessage: standardNotificationMessage); BuildParameters.PrintParameters(Context);