Skip to content

Commit

Permalink
Merge pull request #288 from nils-a/release/4.0.0
Browse files Browse the repository at this point in the history
Release/4.0.0
  • Loading branch information
nils-a authored Oct 1, 2022
2 parents d99de56 + 3746b74 commit cd9b8cb
Show file tree
Hide file tree
Showing 108 changed files with 3,221 additions and 545 deletions.
31 changes: 0 additions & 31 deletions .appveyor.yml

This file was deleted.

1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

14 changes: 11 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
pull_request:

env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
NUGET_SOURCE: "https://api.nuget.org/v3/index.json"
TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
Expand All @@ -42,12 +42,20 @@ jobs:
- name: Gradle Wrapper Validation
uses: gradle/wrapper-validation-action@v1.0.4

# Setup Java 1.8 environment which is needed to build
# Setup Java 11 environment which is needed to build
- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'

# Setup dotnet 6 (and 2.1 for Wyam)
- name: Setup dotnet
uses: actions/setup-dotnet@v3.0.0
with:
dotnet-version: |
2.1.x
6.0.x
# Cache Gradle Wrapper
- name: Setup Gradle Wrapper Cache
Expand All @@ -64,7 +72,7 @@ jobs:
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}

- name: Build project
uses: cake-build/cake-action@v1.4.0
uses: cake-build/cake-action@v1.4.1
with:
script-path: recipe.cake
target: CI
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,7 @@ bin/
obj/
/src/projectTemplates/**/.idea
!/src/projectTemplates/**/build
.vs/
*.user
/src/dotnet/packages/
/src/dotnet/test/packages/
4 changes: 2 additions & 2 deletions docs/input/docs/integrations/editors/rider/index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RedirectFrom: docs/editors/rider
---

<p>
The <a href="https://plugins.jetbrains.com/plugin/15729-cake-rider" target="_blank">Cake plugin for Rider </a>
The <a href="https://plugins.jetbrains.com/plugin/15729-cake-rider" target="_blank">Cake plugin for Rider</a>
brings the following features to JetBrains Rider:
<ul>
<li><a href="/docs/integrations/editors/rider/run-configurations">Run configurations</a></li>
Expand All @@ -24,7 +24,7 @@ RedirectFrom: docs/editors/rider

<div class="alert alert-info">
<p>
The <a href="https://plugins.jetbrains.com/plugin/15729-cake-rider" target="_blank">Cake plugin for Rider</a> supports Rider version 2021.2 and newer.
The <a href="https://plugins.jetbrains.com/plugin/15729-cake-rider" target="_blank">Cake plugin for Rider</a> supports Rider version 2022.2 and newer.
</p>
</div>

Expand Down
29 changes: 26 additions & 3 deletions docs/input/docs/integrations/editors/rider/templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,15 @@ select **Add | Cake File** to create a new Cake file containing some sample code

# Live templates (sometimes called code snippets)

Live templates are only available in Cake files.
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" href="#tool">Cake</a></li>
<li><a data-toggle="tab" href="#frosting">Cake Frosting</a></li>
</ul>

Available live templates:
<div class="tab-content">
<div id="tool" class="tab-pane fade in active">

Available live templates in Cake:

* `cake-addin`
* Provides a basic `#addin` pre-processor directive, where the package name and version can be changed
Expand Down Expand Up @@ -70,4 +76,21 @@ Available live templates:
* `task-action`
* Provides a more complex task definition, including a `.Does` body, where the name of the task can be changed
* `teardown`
* Provides a sample teardown definition
* Provides a sample teardown definition

</div>
<div id="frosting" class="tab-pane fade">

Available live templates in Cake Frosting:

* `cake-task`
* Provides a basic task definition class
* `cake-task-ctx`
* Provides a basic task definition class, using a custom `Context`
* `cake-async-task`
* Provides an async task definition class
* `cake-async-task-ctx`
* Provides an async task definition class, using a custom `Context`

</div>
</div>
5 changes: 3 additions & 2 deletions recipe.cake
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#load nuget:?package=Cake.IntelliJ.Recipe&version=0.1.5

Environment.SetVariableNames();
Environment.SetVariableNames(
githubTokenVariable: "GITHUB_PAT"
);

BuildParameters.SetParameters(
context: Context,
buildSystem: BuildSystem,
sourceDirectoryPath: "./src/rider",
title: "Cake for Rider",
repositoryName: "Cake-Rider",
appVeyorProjectSlug: "Cake-Rider", // https://github.com/cake-contrib/Cake.Recipe/issues/816
repositoryOwner: "cake-build",
marketplaceId: "15729-cake-rider",
webLinkRoot: "", // do *not* create a virtual directory for wyam docs. This setting will break gh-pages. (But work for preview)
Expand Down
Loading

0 comments on commit cd9b8cb

Please sign in to comment.