Skip to content

Commit

Permalink
Merge pull request #27 from nils-a/feature/GH-20
Browse files Browse the repository at this point in the history
(#20) Bump Cake.Recipe to 2.2.1
  • Loading branch information
nils-a authored Jul 22, 2024
2 parents 1a8cc4a + 31f5aeb commit c217c94
Show file tree
Hide file tree
Showing 10 changed files with 131 additions and 425 deletions.
22 changes: 19 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
#---------------------------------#
# Build Image #
#---------------------------------#
image: Visual Studio 2017
image: Visual Studio 2022

#---------------------------------#
# Install .NET #
#---------------------------------#
install:
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
- ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 2.1 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 3.1 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 5.0 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 6.0 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 7.0 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 8.0 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
- ps: dotnet --info

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

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

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

on:
push:
branches:
- master
- develop
- "feature/**"
- "release/**"
- "hotfix/**"
tags:
- "*"
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]
os: [windows-2022, ubuntu-22.04, macos-12]

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 }}
Expand All @@ -33,38 +38,56 @@ jobs:
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
uses: actions/checkout@v4

- name: Fetch all tags and branches
run: git fetch --prune --unshallow

- name: Cache Tools
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake', '.config/dotnet-tools.json') }}

# install libgit2-dev on ubuntu, so libgit2sharp works
- name: Install libgit-dev
if: runner.os == 'Linux'
run: sudo apt-get install -y libgit2-dev

- name: Setup required dotnet versions
uses: actions/[email protected]
with:
dotnet-version: |
2.1.818
3.1.x
5.0.x
6.0.x
7.0.x
8.0.x
- name: Build project
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@v2.0.0
with:
script-path: recipe.cake
target: CI
verbosity: Normal
cake-version: 0.38.5
cake-bootstrap: true
cake-version: tool-manifest
cake-bootstrap: explicit

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

- name: Upload Packages
uses: actions/upload-artifact@v2
if: runner.os == 'Windows'
uses: actions/upload-artifact@v4
with:
if-no-files-found: warn
name: package
path: BuildArtifacts/Packages/**/*
path: BuildArtifacts/Packages/**/*
12 changes: 6 additions & 6 deletions .github/workflows/release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:

steps:
- name: Checkout the requested branch
uses: actions/checkout@v2.3.4
uses: actions/checkout@v4
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- name: Cache Tools
uses: actions/cache@v2.1.4
uses: actions/cache@v4
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake', '.config/dotnet-tools.json') }}
- name: Set up git version
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
uses: gittools/actions/gitversion/[email protected]
Expand All @@ -38,10 +38,10 @@ 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.0.0
with:
script-path: recipe.cake
target: releasenotes
verbosity: Diagnostic
cake-version: 0.38.5
verbosity: Normal
cake-version: tool-manifest
cake-bootstrap: true
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
56 changes: 28 additions & 28 deletions Source/Cake.Chocolatey.Module.sln
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Chocolatey.Module", "Cake.Chocolatey.Module\Cake.Chocolatey.Module.csproj", "{666C4FA1-0963-4836-9E54-89FBBE4C9381}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Chocolatey.Module.Tests", "Cake.Chocolatey.Module.Tests\Cake.Chocolatey.Module.Tests.csproj", "{1A12838D-0FD6-448E-834F-23927CF9D91E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{666C4FA1-0963-4836-9E54-89FBBE4C9381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{666C4FA1-0963-4836-9E54-89FBBE4C9381}.Debug|Any CPU.Build.0 = Debug|Any CPU
{666C4FA1-0963-4836-9E54-89FBBE4C9381}.Release|Any CPU.ActiveCfg = Release|Any CPU
{666C4FA1-0963-4836-9E54-89FBBE4C9381}.Release|Any CPU.Build.0 = Release|Any CPU
{1A12838D-0FD6-448E-834F-23927CF9D91E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A12838D-0FD6-448E-834F-23927CF9D91E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A12838D-0FD6-448E-834F-23927CF9D91E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A12838D-0FD6-448E-834F-23927CF9D91E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Chocolatey.Module", "Cake.Chocolatey.Module\Cake.Chocolatey.Module.csproj", "{666C4FA1-0963-4836-9E54-89FBBE4C9381}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Chocolatey.Module.Tests", "Cake.Chocolatey.Module.Tests\Cake.Chocolatey.Module.Tests.csproj", "{1A12838D-0FD6-448E-834F-23927CF9D91E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{666C4FA1-0963-4836-9E54-89FBBE4C9381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{666C4FA1-0963-4836-9E54-89FBBE4C9381}.Debug|Any CPU.Build.0 = Debug|Any CPU
{666C4FA1-0963-4836-9E54-89FBBE4C9381}.Release|Any CPU.ActiveCfg = Release|Any CPU
{666C4FA1-0963-4836-9E54-89FBBE4C9381}.Release|Any CPU.Build.0 = Release|Any CPU
{1A12838D-0FD6-448E-834F-23927CF9D91E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A12838D-0FD6-448E-834F-23927CF9D91E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A12838D-0FD6-448E-834F-23927CF9D91E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A12838D-0FD6-448E-834F-23927CF9D91E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Loading

0 comments on commit c217c94

Please sign in to comment.