Skip to content

Commit

Permalink
Merge branch 'release/1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
AdmiringWorm committed May 4, 2024
2 parents 3117ded + 38ecefd commit e15609f
Show file tree
Hide file tree
Showing 18 changed files with 574 additions and 166 deletions.
13 changes: 12 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,15 @@
"doc",
"ideas"
]
},
{
"login": "nils-a",
"name": "Nils Andresen",
"avatar_url": "https://avatars.githubusercontent.com/u/349188?v=4",
"profile": "https://blog.nils-andresen.de",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand All @@ -106,5 +115,7 @@
"link": "<%= options.repoHost %>/<%= options.projectOwner %>/<%= options.projectName %>/issues?q=author%3A<%= contributor.login %>"
}
},
"skipCi": true
"skipCi": true,
"commitType": "docs",
"commitConvention": "angular"
}
20 changes: 10 additions & 10 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"cake.tool": {
"version": "0.38.5",
"commands": [
"dotnet-cake"
]
"version": 1,
"isRoot": true,
"tools": {
"cake.tool": {
"version": "1.3.0",
"commands": [
"dotnet-cake"
]
}
}
}
}
}
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ indent_size = 2
indent_size = 2
trim_trailing_whitespace = false

[.all-contributorsrc]
indent_style = unset
indent_size = unset

# C# files
[*.cs]
#### .NET Coding Conventions ####
Expand Down
21 changes: 16 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@ on:
- "release/**"
- "hotfix/**"
- "feature/**"
tags:
- "*"
pull_request:

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-2019, ubuntu-18.04, macos-10.15]
os: [windows-2022, ubuntu-22.04, macos-13]
env:
AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
AZURE_SOURCE: ${{ secrets.AZURE_SOURCE }}
AZURE_USER: ${{ secrets.AZURE_USER }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
GITTER_ROOM_ID: ${{ secrets.GITTER_ROOM_ID }}
GITTER_TOKEN: ${{ secrets.GITTER_TOKEN }}
Expand All @@ -38,18 +41,26 @@ jobs:
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- name: Cache Tools
uses: actions/cache@v2.1.4
uses: actions/cache@v4.0.2
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('setup.cake') }}
- name: install .NET versions
uses: actions/[email protected]
with:
# codecov in cake.recipe needs 2.1!
# version used for GitReleaseManager needs .NET Core 3.0
dotnet-version: |
2.1.x
5.0.x
6.0.x
- name: Build Addin
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@v2
with:
script-path: setup.cake
target: CI
verbosity: Diagnostic
cake-version: 0.38.5
cake-bootstrap: true
cake-version: tool-manifest
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ on:

jobs:
super_linter:
name: List with Super Linter
runs-on: ubuntu-18.04
name: Lint with Super Linter
runs-on: ubuntu-22.04

steps:
- uses: actions/[email protected]
with:
fetch-depth: 0

- name: Lint Code Base
uses: github/super-linter@v3.15.5
uses: github/super-linter@v5.0.0
env:
VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: develop
Expand Down
17 changes: 13 additions & 4 deletions .github/workflows/pre-release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,36 @@ jobs:
draft-pre-release:
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

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/cache@v2.1.4
uses: actions/cache@v4.0.2
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('setup.cake') }}
- name: install .NET versions
uses: actions/[email protected]
with:
# codecov in cake.recipe needs 2.1!
# version used for GitReleaseManager needs .NET Core 3.0
dotnet-version: |
2.1.x
5.0.x
6.0.x
- name: Set up git version
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
uses: gittools/actions/gitversion/setup@v0.9.9
uses: gittools/actions/gitversion/setup@v1.1.1
with:
versionSpec: "5.x"
- name: Run git version
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.9
uses: gittools/actions/gitversion/execute@v1.1.1
- name: Create release branch ${{ github.event.inputs.version }}
if: ${{ steps.gitversion.outputs.majorMinorPatch }}
run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }}
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/publishdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
WYAM_ACCESS_TOKEN: ${{ secrets.WYAM_ACCESS_TOKEN }}
WYAM_DEPLOY_REMOTE: "${{ github.event.repository.html_url }}"
WYAM_DEPLOY_BRANCH: "gh-pages"
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- name: Checkout the requested branch
Expand All @@ -19,15 +19,22 @@ jobs:
fetch-depth: 0
ref: ${{ github.event.ref }}
- name: Cache Tools
uses: actions/cache@v2.1.4
uses: actions/cache@v4.0.2
with:
path: tools
key: ${{ runner.os }}-doc-tools-${{ hashFiles('setup.cake') }}
- name: install .NET versions
uses: actions/[email protected]
with:
# codecov in cake.recipe needs 2.1!
dotnet-version: |
2.1.x
3.1.x
5.0.x
- name: Publishing documentaiton
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@v2
with:
script-path: setup.cake
target: Force-Publish-Documentation
verbosity: Diagnostic
cake-version: 0.38.5
cake-bootstrap: true
cake-version: tool-manifest
22 changes: 15 additions & 7 deletions .github/workflows/release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,36 @@ jobs:
draft-stable:
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

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/cache@v2.1.4
uses: actions/cache@v4.0.2
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('setup.cake') }}
- name: install .NET versions
uses: actions/[email protected]
with:
# codecov in cake.recipe needs 2.1!
# version used for GitReleaseManager needs .NET Core 3.0
dotnet-version: |
2.1.x
5.0.x
6.0.x
- name: Set up git version
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
uses: gittools/actions/gitversion/setup@v0.9.9
uses: gittools/actions/gitversion/setup@v1.1.1
with:
versionSpec: "5.x"
- name: Run git version
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.9
uses: gittools/actions/gitversion/execute@v1.1.1
- name: Create release branch ${{ github.event.inputs.version }}
if: ${{ steps.gitversion.outputs.majorMinorPatch }}
run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }}
Expand All @@ -38,10 +47,9 @@ jobs:
branch: "release/${{ steps.gitversion.outputs.majorMinorPatch }}"
github_token: ${{ secrets.GH_TOKEN }}
- name: Drafting Release Notes
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@v2
with:
script-path: setup.cake
target: releasenotes
verbosity: Diagnostic
cake-version: 0.38.5
cake-bootstrap: true
cake-version: tool-manifest
10 changes: 10 additions & 0 deletions .jscpd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"absolute": true,
"ignore": [
"Source/*.Tests/**"
],
"reporters": [
"consoleFull"
],
"threshold": 0.1
}
1 change: 0 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ pull_request_rules:
actions:
merge:
method: squash
strict: smart
- name: thank user and refer them to add themself as contributor
conditions:
- merged
Expand Down
52 changes: 27 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
[![All Contributors][all-contributorsimage]](#contributors)
[![AppVeyor branch](https://img.shields.io/appveyor/ci/cakecontrib/cake-codecov/master.svg)](https://ci.appveyor.com/project/cakecontrib/cake-codecov/branch/master)
[![NuGet](https://img.shields.io/nuget/v/Cake.Codecov.svg)](https://www.nuget.org/packages/Cake.Codecov/)
[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?maxAge=2592000)](https://gitter.im/cake-contrib/Lobby)
[![Codecov](https://img.shields.io/codecov/c/github/cake-contrib/Cake.Codecov.svg)](https://codecov.io/gh/cake-contrib/Cake.Codecov)
[![SonarCloud Quality Gate](https://img.shields.io/sonar/quality_gate/cake-contrib_Cake.Codecov?logo=sonarcloud&server=https%3A%2F%2Fsonarcloud.io)](https://sonarcloud.io/dashboard?id=cake-contrib_Cake.Codecov)

A [Cake](https://cakebuild.net) addin that extends Cake with the ability to use [Codecov](https://codecov.io) ([.NET Edition](https://github.com/codecov/codecov-exe)).
A [Cake](https://cakebuild.net) addin that extends Cake with the ability to use
the official
[Codecov](https://docs.codecov.com/docs/codecov-uploader#using-the-cli) CLI that
have been repackaged as a NuGet package named [CodecovUploader](https://www.nuget.org/packages/CodecovUploader).

<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
Expand All @@ -27,15 +28,12 @@ A [Cake](https://cakebuild.net) addin that extends Cake with the ability to use
In order to use this addin, add to your Cake script

```csharp
#tool nuget:?package=Codecov
#addin nuget:?package=Cake.Codecov
#tool nuget:?package=CodecovUploader
#addin nuget:?package=Cake.Codecov // Any versions before 1.1.0 is not guaranteed to work anymore.
```

Then use one of the following snippets to upload your coverage report to Codecov.

*NOTE: Starting for codecov version [1.6.0](https://github.com/codecov/codecov-exe/releases/tag/1.6.0) globbing
patterns are also supported for file paths.*

```csharp
Task("Upload-Coverage")
.Does(() =>
Expand Down Expand Up @@ -87,13 +85,14 @@ Task("Upload-Coverage")

## Documentation

Documentation for the addin can be found on the [Cake Website](http://cakebuild.net/dsl/codecov/).
Documentation for the addin can be found on the [Cake Website](https://cakebuild.net/extensions/cake-codecov/).

## Codecov Tips

1. The [codecov-exe](https://github.com/codecov/codecov-exe) uploader defined in `#tool nuget:?package=Codecov` currently supports Windows, OSX and Linux builds. (_Note: There also the [Codecov.Tool](https://www.nuget.org/packages/Codecov.Tool) utility)
2. CI Services like AppVeyor and Travis CI do not require a Codecov upload token. Any other provider would need one to be specified on the command line or through an Environment variable called `CODECOV_TOKEN`. See all supported CI providers in the [codecov-exe documentation](https://github.com/codecov/codecov-exe#ci-providers)
3. Using Codecov with TeamCity MAY require configuration. Please refer to the [codecov-exe documentation](https://github.com/codecov/codecov-exe#teamcity).
1. While CI Service like GitHub Action, these workflows are likely to hit a rate
limit on Codecov. As such it is recommended to always pass in a repository or
global token when one is available.
2. Do not set NonZero to `true` when running without a Codecov token.

## Questions

Expand Down Expand Up @@ -132,19 +131,22 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="https://www.linkedin.com/in/larz-white-5a8264108"><img src="https://avatars0.githubusercontent.com/u/6298611?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Larz White</b></sub></a><br /><a href="#maintenance-larzw" title="Maintenance">🚧</a></td>
<td align="center"><a href="https://github.com/AdmiringWorm"><img src="https://avatars3.githubusercontent.com/u/1474648?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kim J. Nordmo</b></sub></a><br /><a href="#maintenance-AdmiringWorm" title="Maintenance">🚧</a></td>
<td align="center"><a href="http://www.gep13.co.uk/blog"><img src="https://avatars3.githubusercontent.com/u/1271146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gary Ewan Park</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/pulls?q=is%3Apr+reviewed-by%3Agep13" title="Reviewed Pull Requests">πŸ‘€</a> <a href="https://github.com/cake-contrib/Cake.Codecov/issues?q=author%3Agep13" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
<td align="center"><a href="https://github.com/vkbishnoi"><img src="https://avatars0.githubusercontent.com/u/8297727?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vishal Bishnoi</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/commits?author=vkbishnoi" title="Code">πŸ’»</a></td>
<td align="center"><a href="https://twitter.com/hereispascal"><img src="https://avatars1.githubusercontent.com/u/2190718?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pascal Berger</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/issues?q=author%3Apascalberger" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
<td align="center"><a href="https://github.com/twenzel"><img src="https://avatars2.githubusercontent.com/u/500376?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Toni Wenzel</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/issues?q=author%3Atwenzel" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
<td align="center"><a href="https://github.com/Jericho"><img src="https://avatars0.githubusercontent.com/u/112710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jericho</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/issues?q=author%3AJericho" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/gitfool"><img src="https://avatars2.githubusercontent.com/u/750121?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sean Fausett</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/commits?author=gitfool" title="Code">πŸ’»</a></td>
<td align="center"><a href="https://augustoproiete.net"><img src="https://avatars.githubusercontent.com/u/177608?v=4?s=100" width="100px;" alt=""/><br /><sub><b>C. Augusto Proiete</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/commits?author=augustoproiete" title="Documentation">πŸ“–</a> <a href="https://github.com/cake-contrib/Cake.Codecov/issues?q=author%3Aaugustoproiete" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
</tr>
<tbody>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/larz-white-5a8264108"><img src="https://avatars0.githubusercontent.com/u/6298611?v=4?s=100" width="100px;" alt="Larz White"/><br /><sub><b>Larz White</b></sub></a><br /><a href="#maintenance-larzw" title="Maintenance">🚧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AdmiringWorm"><img src="https://avatars3.githubusercontent.com/u/1474648?v=4?s=100" width="100px;" alt="Kim J. Nordmo"/><br /><sub><b>Kim J. Nordmo</b></sub></a><br /><a href="#maintenance-AdmiringWorm" title="Maintenance">🚧</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.gep13.co.uk/blog"><img src="https://avatars3.githubusercontent.com/u/1271146?v=4?s=100" width="100px;" alt="Gary Ewan Park"/><br /><sub><b>Gary Ewan Park</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/pulls?q=is%3Apr+reviewed-by%3Agep13" title="Reviewed Pull Requests">πŸ‘€</a> <a href="https://github.com/cake-contrib/Cake.Codecov/issues?q=author%3Agep13" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/vkbishnoi"><img src="https://avatars0.githubusercontent.com/u/8297727?v=4?s=100" width="100px;" alt="Vishal Bishnoi"/><br /><sub><b>Vishal Bishnoi</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/commits?author=vkbishnoi" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://twitter.com/hereispascal"><img src="https://avatars1.githubusercontent.com/u/2190718?v=4?s=100" width="100px;" alt="Pascal Berger"/><br /><sub><b>Pascal Berger</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/issues?q=author%3Apascalberger" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/twenzel"><img src="https://avatars2.githubusercontent.com/u/500376?v=4?s=100" width="100px;" alt="Toni Wenzel"/><br /><sub><b>Toni Wenzel</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/issues?q=author%3Atwenzel" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Jericho"><img src="https://avatars0.githubusercontent.com/u/112710?v=4?s=100" width="100px;" alt="jericho"/><br /><sub><b>jericho</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/issues?q=author%3AJericho" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/gitfool"><img src="https://avatars2.githubusercontent.com/u/750121?v=4?s=100" width="100px;" alt="Sean Fausett"/><br /><sub><b>Sean Fausett</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/commits?author=gitfool" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://augustoproiete.net"><img src="https://avatars.githubusercontent.com/u/177608?v=4?s=100" width="100px;" alt="C. Augusto Proiete"/><br /><sub><b>C. Augusto Proiete</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/commits?author=augustoproiete" title="Documentation">πŸ“–</a> <a href="https://github.com/cake-contrib/Cake.Codecov/issues?q=author%3Aaugustoproiete" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://blog.nils-andresen.de"><img src="https://avatars.githubusercontent.com/u/349188?v=4?s=100" width="100px;" alt="Nils Andresen"/><br /><sub><b>Nils Andresen</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.Codecov/commits?author=nils-a" title="Code">πŸ’»</a></td>
</tr>
</tbody>
</table>

<!-- markdownlint-restore -->
Expand Down
Loading

0 comments on commit e15609f

Please sign in to comment.