Skip to content

Commit

Permalink
Merge branch 'release/4.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed Apr 20, 2024
2 parents 9f1ee22 + c506da2 commit f78ad4e
Show file tree
Hide file tree
Showing 50 changed files with 793 additions and 50 deletions.
8 changes: 8 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,13 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"github>cake-contrib/renovate-presets:cake-issues"
],
"packageRules": [
{
"description": "Do not update Microsoft.Build.* packages in Cake.Issues.MsBuild since required version depends on the version used in MSBuild.StructuredLogger",
"matchFileNames": ["src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj"],
"matchDepNames": ["Microsoft.Build.Framework", "Microsoft.Build.Utilities.Core"],
"enabled": false
}
]
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and tests
name: Integration tests

# Workflow Trigger
on:
Expand Down Expand Up @@ -32,10 +32,39 @@ jobs:
run: ./build.sh
shell: bash
- name: Publish NuGet package as build artifact
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4
with:
name: NuGet Package
path: ./BuildArtifacts/Packages/NuGet/
# Integration Tests Cake.Issues.MsBuild Cake Scripting
IntegrationTestsMsBuildCakeScripting:
name: Integration Tests Cake.Issues.MsBuild Cake Scripting
needs: Build
strategy:
fail-fast: false
matrix:
os: [
windows-2019, windows-2022,
ubuntu-20.04, ubuntu-22.04,
macos-11, macos-14]
dotnet: [6.x, 7.x, 8.x]
runs-on: ${{ matrix.os }}
steps:
- name: Get the sources
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Download build artifact
uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d # v4
with:
name: NuGet Package
path: ./BuildArtifacts/Packages/NuGet
- name: Install .NET
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Run integration tests
run: ./build.sh --verbosity=diagnostic
working-directory: ./tests/Cake.Issues.MsBuild/script-runner/
shell: bash
# Integration Tests Cake.Issues.PullRequests.GitHubActions Cake Scripting
IntegrationTestsPullRequestsGitHubActionsCakeScripting:
name: Integration Tests Cake.Issues.PullRequests.GitHubActions Cake Scripting
Expand All @@ -54,7 +83,7 @@ jobs:
- name: Get the sources
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Download build artifact
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4
uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d # v4
with:
name: NuGet Package
path: ./BuildArtifacts/Packages/NuGet
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Unit tests

# Workflow Trigger
on:
# Trigger the workflow on a pull request to any branch
pull_request:
# Triggers the workflow in the event there is a push to master
push:
branches:
- master

jobs:
Test:
name: Run unit tests
strategy:
fail-fast: false
matrix:
os: [
windows-2019, windows-2022,
ubuntu-20.04, ubuntu-22.04,
# Cake.Recipe currently does not support macOS 14 (M1)
macos-11, macos-13]
runs-on: ${{ matrix.os }}
steps:
- name: Get the sources
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- name: Install .NET
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4
with:
# .NET 5 required for GitVersion
dotnet-version: |
5.x
6.x
7.x
8.x
- name: Test
run: ./build.sh --target=Test
shell: bash
73 changes: 64 additions & 9 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,24 @@ pr:

stages:
- stage: BuildStage
displayName: Build
displayName: Full Build
dependsOn: []
jobs:
- job: BuildJob
displayName: Build & Unit Tests
displayName: Build
pool:
vmImage: 'windows-2022'
steps:
- template: .azuredevops/pipelines/templates/steps/install-required-dotnet-versions-for-building.yml
- bash: ./build.sh
displayName: 'Build & Run Unit Tests'

- stage: UnitTestStage
displayName: Unit Tests
dependsOn: []
jobs:
- job: UnitTestJob
displayName: Unit Tests
strategy:
matrix:
Windows:
Expand All @@ -27,16 +41,28 @@ stages:
vmImage: $(imageName)
steps:
- template: .azuredevops/pipelines/templates/steps/install-required-dotnet-versions-for-building.yml
- bash: ./build.sh
- bash: ./build.sh --target=Test
displayName: 'Run Unit Tests'

- stage: IntegrationTestsBuildStage
displayName: Build
dependsOn: []
jobs:
- job: CreateNuGetPackagesJob
displayName: Create NuGet Packages
pool:
vmImage: 'ubuntu-22.04'
steps:
- template: .azuredevops/pipelines/templates/steps/install-required-dotnet-versions-for-building.yml
- bash: ./build.sh --target=Create-NuGet-Packages
displayName: 'Build & Run Unit Tests'
- publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
artifact: NuGet Package
displayName: 'Publish NuGet package as build artifact'
condition: eq( variables['System.JobName'], 'Windows' )

- stage: IntegrationTestsGitRepositoryStage
displayName: Integration Tests Cake.Issues.GitRepository
dependsOn: BuildStage
dependsOn: IntegrationTestsBuildStage
jobs:
- job: TestGitRepositoryScriptingJob
displayName: Test Cake Scripting
Expand Down Expand Up @@ -68,7 +94,7 @@ stages:

- stage: IntegrationTestsMarkdownlintStage
displayName: Integration Tests Cake.Issues.Markdownlint
dependsOn: BuildStage
dependsOn: IntegrationTestsBuildStage
jobs:
- job: TestMarkdownlintJob
displayName: Test
Expand Down Expand Up @@ -99,9 +125,38 @@ stages:
artifact: Integration Tests Cake.Issues.Markdownlint $(System.JobName)
displayName: 'Publish generated reports as build artifact'

- stage: IntegrationTestsMsBuildStage
displayName: Integration Tests Cake.Issues.MsBuild
dependsOn: IntegrationTestsBuildStage
jobs:
- job: TestMsBuildJob
displayName: Test
strategy:
matrix:
Windows_Server_2019:
imageName: 'windows-2019'
Windows_Server_2022:
imageName: 'windows-2022'
macOS_11:
imageName: 'macOS-11'
macOS_13:
imageName: 'macOS-13'
Ubuntu_20_04:
imageName: 'ubuntu-20.04'
Ubuntu_22_04:
imageName: 'ubuntu-22.04'
pool:
vmImage: $(imageName)
steps:
- template: .azuredevops/pipelines/templates/steps/install-net6.yml
- template: .azuredevops/pipelines/templates/steps/provide-nuget-packages.yml
- powershell: ./build.ps1 --verbosity=diagnostic
workingDirectory: ./tests/Cake.Issues.MsBuild/script-runner
displayName: 'Run integration tests'

- stage: IntegrationTestsReportingConsoleStage
displayName: Integration Tests Cake.Issues.Reporting.Console
dependsOn: BuildStage
dependsOn: IntegrationTestsBuildStage
jobs:
- job: TestReportingConsoleScriptingJob
displayName: Test Cake Scripting
Expand Down Expand Up @@ -154,7 +209,7 @@ stages:

- stage: IntegrationTestsReportingGenericStage
displayName: Integration Tests Cake.Issues.Reporting.Generic
dependsOn: BuildStage
dependsOn: IntegrationTestsBuildStage
jobs:
- job: TestReportingGenericScriptingJob
displayName: Test Cake Scripting
Expand Down Expand Up @@ -215,7 +270,7 @@ stages:

- stage: IntegrationTestsReportingSarifStage
displayName: Integration Tests Cake.Issues.Reporting.Sarif
dependsOn: BuildStage
dependsOn: IntegrationTestsBuildStage
jobs:
- job: TestReportingSarifScriptingJob
displayName: Test Cake Scripting
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.DocFx.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.DocFx.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-issueprovider linting docfx</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.EsLint.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.EsLint.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-issueprovider code-analysis javascript linting eslint</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.GitRepository.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.GitRepository.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-issueprovider code-analysis linting git</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.InspectCode.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.InspectCode.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-issueprovider codeanalysis linting inspectcode</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.Markdownlint.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.Markdownlint.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-issueprovider linting markdown markdownlint</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
8 changes: 4 additions & 4 deletions nuspec/nuget/Cake.Frosting.Issues.MsBuild.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ For addin compatible with Cake Script Runners see Cake.Issues.MsBuild.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-issueprovider code-analysis linting msbuild</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
<dependency id="Cake.Issues" version="[4.0.0-beta0001,5.0)" exclude="Build,Analyzers" />
<dependency id="MSBuild.StructuredLogger" version="2.2.206" exclude="Build,Analyzers" />
<dependency id="MSBuild.StructuredLogger" version="2.2.235" exclude="Build,Analyzers" />
</group>
<group targetFramework="net7.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
<dependency id="Cake.Issues" version="[4.0.0-beta0001,5.0)" exclude="Build,Analyzers" />
<dependency id="MSBuild.StructuredLogger" version="2.2.206" exclude="Build,Analyzers" />
<dependency id="MSBuild.StructuredLogger" version="2.2.235" exclude="Build,Analyzers" />
</group>
<group targetFramework="net8.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
<dependency id="Cake.Issues" version="[4.0.0-beta0001,5.0)" exclude="Build,Analyzers" />
<dependency id="MSBuild.StructuredLogger" version="2.2.206" exclude="Build,Analyzers" />
<dependency id="MSBuild.StructuredLogger" version="2.2.235" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.PullRequests.AppVe
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-pullrequestsystem issues pullrequest buildserver appveyor</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.PullRequests.Azure
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-pullrequestsystem issues pullrequest tfs azure-devops azure-devops-server</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.PullRequests.GitHu
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-pullrequestsystem issues pullrequest buildserver github github-actions</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.PullRequests.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.PullRequests.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>Cake Script Cake-Issues CodeAnalysis Linting Issues Pull-Requests</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.Reporting.Console.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The addin requires Cake Frosting 1.2.0 or higher.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-reportformat issues reporting console</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.Reporting.Generic.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.Reporting.Generic.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-reportformat issues reporting html markdown razor</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.Reporting.Sarif.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.Reporting.Sarif.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-reportformat issues reporting sarif</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.Reporting.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.Reporting.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>Cake Script Cake-Issues CodeAnalysis Linting Issues Reporting</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.Sarif.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.Sarif.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-issueprovider linting sarif</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.Issues.Terraform.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ For addin compatible with Cake Script Runners see Cake.Issues.Terraform.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
<copyright>Copyright © Cake Issues contributors</copyright>
<tags>cake cake-addin cake-issues cake-issueprovider linting terraform</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.2.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/4.3.0</releaseNotes>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Cake.Core" version="4.0" exclude="Build,Analyzers" />
Expand Down
Loading

0 comments on commit f78ad4e

Please sign in to comment.