Skip to content

Commit

Permalink
Merge branch 'release/2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
nils-a committed Mar 11, 2021
2 parents 27c0fb7 + f983bf9 commit d636c42
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 25 deletions.
28 changes: 15 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,30 @@ name: Build

on:
push:
branches:
- main
- develop
- "feature/**"
- "release/**"
- "hotfix/**"
tags:
- "*"
paths-ignore:
- "README.md"
pull_request:

env:
# workaround for https://github.com/cake-contrib/Cake.Recipe/issues/724
ACTIONS_ALLOW_UNSECURE_COMMANDS: true

jobs:
build:
runs-on: ${{ matrix.os }}
#mimic "skip_branch_with_pr: true", see https://github.community/t/duplicate-checks-on-push-and-pull-request-simultaneous-event/18012/4
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
os: [ windows-2019, ubuntu-18.04, macos-10.15 ]

steps:
- uses: actions/[email protected]
with:
fetch-depth: 0
ref: ${{ github.event.ref }}
- name: Checkout the repository
uses: actions/checkout@v2
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- name: Cache Tools
uses: actions/cache@v2
with:
Expand All @@ -35,7 +37,7 @@ jobs:
script-path: recipe.cake
target: CI
verbosity: Diagnostic
cake-version: 0.38.4
cake-version: 0.38.5
cake-bootstrap: true
- name: Upload Issues
uses: actions/upload-artifact@v2
Expand All @@ -47,7 +49,7 @@ jobs:
BuildArtifacts/**/coverlet/*.xml
- name: Upload Packages
uses: actions/upload-artifact@v2
if: matrix.os == 'windows-latest'
if: runner.os == 'Windows'
with:
if-no-files-found: warn
name: package
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2.3.4
uses: actions/checkout@v2
with:
fetch-depth: 0

Expand All @@ -53,7 +53,7 @@ jobs:
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

- run: ./build.ps1
- run: ./build.ps1 --target=DotNetCore-Build
shell: pwsh

- name: Perform CodeQL Analysis
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publishDocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
ref: ${{ github.event.ref }}

- name: Cache Tools
uses: actions/cache@v2.1.1
uses: actions/cache@v2
with:
path: tools
key: ${{ runner.os }}-doc-tools-${{ hashFiles('recipe.cake') }}
Expand All @@ -32,5 +32,5 @@ jobs:
script-path: recipe.cake
target: Force-Publish-Documentation
verbosity: Diagnostic
cake-version: 0.38.4
cake-version: 0.38.5
cake-bootstrap: true
11 changes: 11 additions & 0 deletions GitReleaseManager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ create:
with `#addin nuget:?package=Cake.AsciiDoctorJ&version={milestone}`.
footer-includes-milestone: true
milestone-replace-text: "{milestone}"
include-sha-section: true
sha-section-heading: "SHA256 Hashes of the release artifacts"
sha-section-line-format: "- `{1}\t{0}`"
export:
include-created-date-in-title: true
created-date-string-format: yyyy-MM-dd
Expand All @@ -32,3 +35,11 @@ issue-labels-alias:
- name: security
header: Security
plural: Security
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/Cake.AsciiDoctorJ/{milestone})
Your **[GitReleaseManager](https://github.com/GitTools/GitReleaseManager)** bot :package::rocket:
2 changes: 1 addition & 1 deletion recipe.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#load nuget:?package=Cake.Recipe&version=2.1.0
#load nuget:?package=Cake.Recipe&version=2.2.0

Environment.SetVariableNames();

Expand Down
8 changes: 4 additions & 4 deletions src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Testing" Version="1.0.0" />
<PackageReference Include="coverlet.msbuild" Version="3.0.2">
<PackageReference Include="Cake.Testing" Version="1.1.0" />
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Moq" Version="4.16.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="Text.Analyzers" Version="2.6.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
6 changes: 3 additions & 3 deletions src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@
<Description>makes [asciidoctorj](https://github.com/asciidoctor/asciidoctorj) available as a tool in [cake](https://cakebuild.net/)</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://cake-contrib.github.io/cake.asciidoctorj</PackageProjectUrl>
<PackageTags>cake;addin;asciidoctorj</PackageTags>
<PackageTags>cake,build,cake-build,addin,script,asciidoctorj</PackageTags>
<RepositoryUrl>https://github.com/cake-contrib/Cake.AsciiDoctorJ.git</RepositoryUrl>
<PackageReleaseNotes>https://github.com/cake-contrib/Cake.AsciiDoctorJ/releases/tag/$(Version)</PackageReleaseNotes>
<PackageIcon>icon.png</PackageIcon>
<PackageIconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png</PackageIconUrl>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Addin.Analyzer" Version="0.1.1">
<PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="CakeContrib.Guidelines" Version="0.5.0" PrivateAssets="All" />
<PackageReference Include="IDisposableAnalyzers" Version="3.4.8">
<PackageReference Include="IDisposableAnalyzers" Version="3.4.13">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit d636c42

Please sign in to comment.