Skip to content

Commit

Permalink
Merge branch 'develop' into feature/gitpod
Browse files Browse the repository at this point in the history
  • Loading branch information
bjorkstromm authored Feb 16, 2022
2 parents 379557d + a50a6b6 commit e5740f7
Show file tree
Hide file tree
Showing 844 changed files with 28,189 additions and 16,777 deletions.
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": "2.0.0",
"commands": [
"dotnet-cake"
]
}
}
}
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
*.sh text eol=lf

###############################################################################
# Set default behavior for command prompt diff.
Expand Down
67 changes: 0 additions & 67 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

77 changes: 77 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Bug report
description: Create a report to help us improve
body:
- type: checkboxes
attributes:
label: Prerequisites
options:
- label: I have written a descriptive issue title
required: true
- label: I have searched [issues](https://github.com/cake-build/cake/issues) to ensure it has not already been reported
required: true
- type: dropdown
attributes:
label: Cake runner
options:
- Cake .NET Tool
- Cake Frosting
- Cake runner for .NET Framework
- Cake runner for .NET Core
multiple: true
validations:
required: true
- type: input
attributes:
label: Cake version
validations:
required: true
- type: dropdown
attributes:
label: Operating system
options:
- Linux
- Windows
- macOS
- N/A
multiple: true
validations:
required: true
- type: dropdown
attributes:
label: Operating system architecture
options:
- 32-Bit
- 64-Bit
- N/A
validations:
required: true
- type: input
attributes:
label: CI Server
description: If you're running on a build server (GitHub Actions, Azure DevOps, etc)
validations:
required: false
- type: textarea
attributes:
label: What are you seeing?
description: Describe the issue you are seeing
validations:
required: true
- type: textarea
attributes:
label: What is expected?
description: Describe what you would expect
validations:
required: true
- type: textarea
attributes:
label: Steps to Reproduce
description: List of steps or sample project to reproduce the issue
validations:
required: true
- type: textarea
attributes:
label: Output log
description: Log messages you receive when running with --verbosity=diagnostic. Make sure there is no sensitive data shared and that you place a stack trace inside a code (```) block to avoid formatting issues.
validations:
required: false
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Ask for help or share ideas
url: https://github.com/cake-build/cake/discussions/category_choices
about: Ask the community for help or share ideas for new features.
31 changes: 24 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,46 @@ on:
branches:
- main
- develop
- hotfix/*
jobs:
build:
name: Build
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
os: [windows-latest, ubuntu-18.04, macos-latest]
steps:
- name: Get the sources
uses: actions/checkout@v2

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

- name: Install .NET Core SDK 3.1.301
- name: Install .NET Core SDK 3.1.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.301'
dotnet-version: '3.1.x'

- name: Install .NET Core SDK 5.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'

- name: Install .NET Core SDK (global.json)
uses: actions/setup-dotnet@v1
with:
include-prerelease: 'true'

- name: Run Cake script
uses: ecampidoglio/[email protected]
env:
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
uses: cake-build/cake-action@v1
with:
target: Run-Integration-Tests
cake-bootstrap: true
cake-version: tool-manifest

- name: Validate Integration Tests
uses: cake-build/cake-action@master
with:
script-path: tests/integration/Cake.Common/Build/GitHubActions/ValidateGitHubActionsProvider.cake
cake-version: tool-manifest

36 changes: 36 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: "CodeQL"

on:
push:
branches: [ develop, main]
pull_request:
branches: [ develop ]
schedule:
- cron: '41 21 * * 2'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-18.04

strategy:
fail-fast: false
matrix:
language: [ 'csharp' ]

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

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@v1

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
32 changes: 0 additions & 32 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ Any new code should also have reasonable unit test coverage.
## Contributing process
### Get buyoff or find open community issues or features

* Through GitHub, or through the [Gitter chat](https://gitter.im/cake-build/cake) (preferred),
* Through GitHub, or through the [GitHub discussions](https://github.com/cake-build/cake/discussions) (preferred),
you talk about a feature you would like to see (or a bug), and why it should be in Cake.
* If approved through the Gitter chat, ensure an accompanying GitHub issue is created with
* If approved through the GitHub discussions, ensure an accompanying GitHub issue is created with
information and a link back to the discussion.
* Once you get a nod from one of the [Cake Team](https://github.com/cake-build?tab=members), you can start on the feature.
* Alternatively, if a feature is on the issues list with the
Expand Down
2 changes: 1 addition & 1 deletion GitReleaseManager.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
issue-labels-include:
- Breaking change
- Feature
- Bug
- Improvement
- Bug
- Documentation
issue-labels-exclude:
- Build
Expand Down
2 changes: 1 addition & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
next-version: 1.0.0
next-version: 2.0.0
branches:
master:
regex: main
Expand Down
Loading

0 comments on commit e5740f7

Please sign in to comment.