Skip to content

Commit

Permalink
Merge branch 'release/0.12.0'
Browse files Browse the repository at this point in the history
* release/0.12.0: (23 commits)
  (maint) Add VSCode settings file
  (GH-55) Prefer building on GHA
  (GH-54) Include pdb in nupkg
  (GH-53) Add Cake.Addin.Analyzer package
  (GH-52) Add CakeContrib.Guidelines package
  (maint) Fix copyright
  (GH-51) Enable deterministic build
  (GH-50) Update to use Cake.Recipe 2.2.0
  (GH-49) Add workflow to build on GHA
  (GH-48) Add workflow to generate release notes
  (build) Remove Azure Pipelines build
  (GH-47) Update GRM config
  (build) Use latest Cake.Recipe
  (build) Use latest Cake.Recipe
  (build) Switch off running DupFinder
  (build) Fix target name
  (build) Use latest Cake.Recipe
  (build) Test running in Azure DevOps
  (build) Add Azure DevOps Pipeline yml file
  Fix typo
  ...
  • Loading branch information
gep13 committed Feb 20, 2021
2 parents 35ba2d8 + 9c524db commit fa8857c
Show file tree
Hide file tree
Showing 17 changed files with 263 additions and 407 deletions.
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#---------------------------------#
# Build Image #
#---------------------------------#
image: Visual Studio 2017
image: Visual Studio 2019

#---------------------------------#
# Build Script #
#---------------------------------#
build_script:
- ps: .\build.ps1 -Target AppVeyor
- ps: .\build.ps1 --target=CI

#---------------------------------#
# Tests
Expand Down Expand Up @@ -40,7 +40,7 @@ branches:
# Build Cache #
#---------------------------------#
cache:
- tools -> recipe.cake, tools/packages.config
- tools -> recipe.cake

#---------------------------------#
# Skip builds for doc changes #
Expand Down
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"cake.tool": {
"version": "0.38.5",
"commands": [
"dotnet-cake"
]
}
}
}
70 changes: 70 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Build

on:
push:
paths-ignore:
- "README.md"
pull_request:

jobs:
build:
runs-on: ${{ matrix.os }}
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]

env:
AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
AZURE_SOURCE: ${{ secrets.AZURE_SOURCE }}
AZURE_USER: ${{ secrets.AZURE_USER }}
GITHUB_PAT: ${{ secrets.GH_TOKEN }}
GITTER_ROOM_ID: ${{ secrets.GITTER_ROOM_ID }}
GPR_PASSWORD: ${{ secrets.GPR_PASSWORD }}
GPR_SOURCE: ${{ secrets.GPR_SOURCE }}
GPR_USER: ${{ secrets.GPR_USER }}
GITTER_TOKEN: ${{ secrets.GITTER_TOKEN }}
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
NUGET_SOURCE: "https://api.nuget.org/v3/index.json"
TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }}
TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }}
WYAM_ACCESS_TOKEN: ${{ secrets.WYAM_ACCESS_TOKEN }}
WYAM_DEPLOY_BRANCH: "gh-pages"
WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }}
steps:
- 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:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}

- name: Build project
uses: cake-build/cake-action@v1
with:
script-path: recipe.cake
target: CI
verbosity: Normal
cake-version: 0.38.5
cake-bootstrap: true

- name: Upload Issues-Report
uses: actions/upload-artifact@v2
with:
if-no-files-found: warn
name: issues
path: BuildArtifacts/report.html

- name: Upload Packages
uses: actions/upload-artifact@v2
with:
if-no-files-found: warn
name: package
path: BuildArtifacts/Packages/**/*
47 changes: 47 additions & 0 deletions .github/workflows/release-notes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Draft Release Notes

on:
workflow_dispatch:

jobs:
draft-stable:
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
runs-on: ubuntu-latest

steps:
- name: Checkout the requested branch
uses: actions/[email protected]
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- name: Cache Tools
uses: actions/[email protected]
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
- name: Set up git version
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
uses: gittools/actions/gitversion/[email protected]
with:
versionSpec: "5.x"
- name: Run git version
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
id: gitversion
uses: gittools/actions/gitversion/[email protected]
- name: Create release branch ${{ github.event.inputs.version }}
if: ${{ steps.gitversion.outputs.majorMinorPatch }}
run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }}
- name: Push new branch
if: ${{ steps.gitversion.outputs.majorMinorPatch }}
uses: ad-m/[email protected]
with:
branch: "release/${{ steps.gitversion.outputs.majorMinorPatch }}"
github_token: ${{ secrets.GH_TOKEN }}
- name: Drafting Release Notes
uses: cake-build/cake-action@v1
with:
script-path: recipe.cake
target: releasenotes
verbosity: Diagnostic
cake-version: 0.38.5
cake-bootstrap: true
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"omnisharp.enableEditorConfigSupport": true,
"omnisharp.enableRoslynAnalyzers": true,
"[powershell]": {
"files.encoding": "utf8bom"
},
"powershell.codeFormatting.addWhitespaceAroundPipe": true
}
34 changes: 33 additions & 1 deletion GitReleaseManager.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,48 @@
issue-labels-include:
- Breaking change
- Feature
- Bug
- Feature
- Enhancement
- Improvement
- Documentation
- security
issue-labels-exclude:
- Build
- Internal / Refactoring
issue-labels-alias:
- name: Documentation
header: Documentation
plural: Documentation
- name: security
header: Security
plural: Security
create:
include-footer: true
footer-heading: Where to get it
footer-content: >
You can download this release from
[nuget](https://nuget.org/packages/Cake.Gitter/{milestone}),
or you can just reference it in a cake build script
with `#addin nuget:?package=Cake.Gitter&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
perform-regex-removal: true
regex-text: '[\r\n]*### Where to get it[\r\n]*You can .*`\.[\r\n]*'
multiline-regex: true
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:
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Cake.Gitter is an Addin for [Cake](http://cakebuild.net/) which extends it by al
- [Documentation](https://cake-contrib.github.io/Cake.Gitter/)

## Chat Room
Come join in the conversation about Cake.Gitter in our Gitter Chat Room

Come join in the conversation about Cake.Gitter in our Gitter Chat Room.

[![Join the chat at https://gitter.im/cake-contrib/Lobby](https://badges.gitter.im/cake-contrib/Lobby.svg)](https://gitter.im/cake-contrib/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
5 changes: 0 additions & 5 deletions Source/Cake.Gitter.sln
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppVeyor", "AppVeyor", "{26
..\appveyor.yml = ..\appveyor.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{09555D29-5B47-4529-9199-15755D750883}"
ProjectSection(SolutionItems) = preProject
..\Tools\packages.config = ..\Tools\packages.config
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
33 changes: 33 additions & 0 deletions Source/Cake.Gitter/Cake.Gitter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,47 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<PropertyGroup>
<StartYear>2016</StartYear>
<EndYear>$([System.DateTime]::Today.Year)</EndYear>
<FullYear Condition="'$(StartYear)'=='$(EndYear)'">$(StartYear)</FullYear>
<FullYear Condition="'$(StartYear)'!='$(EndYear)'">$(StartYear)-$(EndYear)</FullYear>

<!-- Properties related to packaging -->
<Authors>Gary Ewan Park</Authors>
<Copyright>Copyright © $(FullYear) — Cake Contributions</Copyright>
<Description>Cake AddIn that extends Cake with ability to send messages to Gitter.</Description>
<PackageIcon>icon.png</PackageIcon>
<PackageIconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png</PackageIconUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/cake-contrib/Home</PackageProjectUrl>
<PackageTags>Cake;Script;Build;Gitter</PackageTags>
<RepositoryUrl>https://github.com/cake-contrib/Cake.Gitter.git</RepositoryUrl>
<PackageReleaseNotes>https://github.com/cake-contrib/Cake.Gitter/releases/tag/$(Version)</PackageReleaseNotes>
</PropertyGroup>

<PropertyGroup>
<CodeAnalysisRuleSet>Cake.Gitter.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Addin.Analyzer" Version="0.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Cake.Common" Version="0.33.0" PrivateAssets="All" />
<PackageReference Include="Cake.Core" Version="0.33.0" PrivateAssets="All" />
<PackageReference Include="CakeContrib.Guidelines" Version="0.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions Source/Cake.Gitter/Chat/GitterChatApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Threading.Tasks;
using Cake.Common.Diagnostics;
using Cake.Core;
using Cake.Core.Annotations;
using Cake.Gitter.LitJson;

namespace Cake.Gitter.Chat
Expand All @@ -22,6 +23,7 @@ internal static class GitterChatApi
/// <param name="message">The message to be sent</param>
/// <param name="messageSettings">The settings to be used when sending the message</param>
/// <returns>An instance of <see cref="GitterChatMessageResult"/> indicating success/failure</returns>
[CakeMethodAlias]
internal static GitterChatMessageResult PostMessage(this ICakeContext context, string message, GitterChatMessageSettings messageSettings)
{
GitterChatMessageResult result;
Expand Down Expand Up @@ -71,6 +73,7 @@ private static async Task<GitterChatMessageResult> PostToIncomingWebHook(ICakeCo
return parsedResult;
}

[CakeMethodAlias]
private static async Task<GitterChatMessageResult> PostToChatApi(this ICakeContext context, string message, GitterChatMessageSettings messageSettings)
{
if (string.IsNullOrWhiteSpace(messageSettings.Token))
Expand Down
Binary file added Source/Cake.Gitter/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions Source/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

<!-- This target must be imported into Directory.Build.targets -->
<!-- Workaround. Remove once we're targeting the 3.1.300+ SDK
https://github.com/dotnet/sourcelink/issues/572 -->
<Project>
<PropertyGroup>
<!-- Uncomment the following if you want to have pdb files embedded inside a nupkg package -->
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>
<ItemGroup>
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
</ItemGroup>
<ItemGroup>
<SourceRoot Include="$(NuGetPackageRoot)" />
</ItemGroup>

<Target Name="CoverletGetPathMap"
DependsOnTargets="InitializeSourceRootMappedPaths"
Returns="@(_LocalTopLevelSourceRoot)"
Condition="'$(DeterministicSourcePaths)' == 'true'">
<ItemGroup>
<_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/>
</ItemGroup>
</Target>
</Project>
4 changes: 0 additions & 4 deletions Tools/packages.config

This file was deleted.

Loading

0 comments on commit fa8857c

Please sign in to comment.