Skip to content

Commit

Permalink
Merge branch 'release/0.1.2' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
nils-a committed Jan 19, 2021
2 parents 6abd237 + d060b66 commit 2f7a02f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Convention based Cake scripts for building IntelliJ plugins.

- [Install](#install)
- [Usage](#usage)
- [Discussion](#discussion)
- [Settings](#settings)
- [Publishing](#publishing)
- [Marketplace-ID](#marketplace-id)
Expand Down Expand Up @@ -60,6 +61,12 @@ Please be aware, that `Cake.IntelliJ.Recipe` wraps a `gradle` build
and uses tasks from `org.jetbrains.intellij` gradle plugin.
It is advised to create the plugin from https://github.com/JetBrains/intellij-platform-plugin-template.

## Discussion

If you have questions, search for an existing one, or create a new discussion on the Cake GitHub repository, using the `extension-q-a` category.

[![Join in the discussion on the Cake repository](https://img.shields.io/badge/GitHub-Discussions-green?logo=github)](https://github.com/cake-build/cake/discussions)

## Settings

### Publishing
Expand Down
8 changes: 4 additions & 4 deletions src/Cake.IntelliJ.Recipe/Content/parameters.cake
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static class BuildParameters

public static string StandardMessage
{
get { return "Version {0} of the {1} plugin has just been released, this will be available here https://plugins.jetbrains.com/plugin/{2}, once the version is revied and approved."; }
get { return "Version {0} of the {1} plugin has just been released, this will be available here https://plugins.jetbrains.com/plugin/{2}, once the version is reviewed and approved."; }
}

public static string GitterMessage
Expand Down Expand Up @@ -387,7 +387,7 @@ public static class BuildParameters
MilestoneReleaseNotesFilePath = milestoneReleaseNotesFilePath ?? SourceDirectoryPath.CombineWithFilePath("CHANGELOG.md");
FullReleaseNotesFilePath = fullReleaseNotesFilePath ?? SourceDirectoryPath.CombineWithFilePath("CHANGELOG.md");

NuSpecFilePath = nuspecFilePath ?? context.MakeAbsolute((FilePath)"./Cake.Recipe/Cake.Recipe.nuspec");
NuSpecFilePath = nuspecFilePath ?? context.MakeAbsolute((FilePath)"./Cake.Recipe/Cake.Recipe.nuspec");

RestorePackagesDirectory = restorePackagesDirectory;

Expand Down Expand Up @@ -433,7 +433,7 @@ public static class BuildParameters
{
BranchType = BranchType.Unknown;
var gitTool = context.Tools.Resolve("git");

if (gitTool == null)
{
gitTool = context.Tools.Resolve("git.exe");
Expand Down Expand Up @@ -477,7 +477,7 @@ public static class BuildParameters
}
}
}
else
else
{
context.Warning("git could not be found!");
}
Expand Down

0 comments on commit 2f7a02f

Please sign in to comment.