Skip to content

Commit

Permalink
Merge branch 'release/6.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
matkoch committed Jun 14, 2022
2 parents 0616863 + 140353f commit 4a24cd4
Show file tree
Hide file tree
Showing 104 changed files with 10,459 additions and 430 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ indent_size = 2
indent_size = 2

# JSON files
[*.json]
[*.{json,js}]
indent_size = 2

# Dotnet code style settings:
Expand Down
39 changes: 36 additions & 3 deletions .github/workflows/continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ jobs:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive
fetch-depth: 0
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
with:
Expand All @@ -42,11 +45,22 @@ jobs:
run: ./build.cmd Test Pack
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v1
with:
name: test-results
path: output/test-results
- uses: actions/upload-artifact@v1
with:
name: packages
path: output/packages
ubuntu-latest:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive
fetch-depth: 0
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
with:
Expand All @@ -58,11 +72,22 @@ jobs:
run: ./build.cmd Test Pack
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v1
with:
name: test-results
path: output/test-results
- uses: actions/upload-artifact@v1
with:
name: packages
path: output/packages
macOS-latest:
name: macOS-latest
runs-on: macOS-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive
fetch-depth: 0
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
with:
Expand All @@ -74,3 +99,11 @@ jobs:
run: ./build.cmd Test Pack
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v1
with:
name: test-results
path: output/test-results
- uses: actions/upload-artifact@v1
with:
name: packages
path: output/packages
35 changes: 35 additions & 0 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: website

on:
push:
branches: [develop]
paths:
- 'website/**'

jobs:
deploy:
name: Deploy Website
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 14.x
cache: npm
cache-dependency-path: website/package-lock.json
- name: Build
working-directory: website
run: |
npm ci
npm run build
# Popular action to deploy to GitHub Pages:
# Docs: https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-docusaurus
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
# Build output to publish to the `gh-pages` branch:
publish_dir: ./website/build
# user_name: github-actions[bot]
# user_email: 41898282+github-actions[bot]@users.noreply.github.com
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ image: mcr.microsoft.com/dotnet/sdk:5.0

variables:
GIT_DEPTH: 0
GIT_SUBMODULE_STRATEGY: recursive

stages:
- build
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "external/spectre.console"]
path = external/spectre.console
url = https://github.com/matkoch/spectre.console

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
Expand Down Expand Up @@ -140,7 +141,8 @@
"Restore",
"SignPackages",
"Test",
"UpdateContributors"
"UpdateContributors",
"UpdateStargazers"
]
}
},
Expand Down Expand Up @@ -182,7 +184,8 @@
"Restore",
"SignPackages",
"Test",
"UpdateContributors"
"UpdateContributors",
"UpdateStargazers"
]
}
},
Expand Down
5 changes: 4 additions & 1 deletion .space.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ job("continuous") {

container("mcr.microsoft.com/dotnet/sdk:6.0") {
shellScript {
content = "./build.sh Test"
content = """
git submodule update --init --recursive
./build.sh Test
"""
}
}

Expand Down
27 changes: 0 additions & 27 deletions .teamcity/patches/projects/_Self.kts

This file was deleted.

28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

25 changes: 24 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,28 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [vNext]

## [6.1.0] / 2022-06-14
- Removed extended setup wizard
- Changed `Nuke.GlobalTool` to use `Spectre.Console`
- Deprecated `CheckBuildProjectConfigurationsAttribute`
- Added single-file packaging and execution
- Added output customization via `NukeBuild.WriteLogo`, `WriteTarget`, and `WriteSummary`
- Added second-chance registration for MSBuild from .NET CLI
- Added submodule support in GitHub Actions, Space Automation, and AppVeyor
- Added `NukeBuild.BuildAssemblyFile` property
- Added generic `EnvironmentInfo.SetVariable`
- Added support for Bitbucket
- Added GitHub Actions support for `fetch-depth`
- Fixed `default_target` replacement in help text
- Fixed parameter padding and line breaks in help text
- Fixed `Assert` methods to accept `IReadOnlyCollection`
- Fixed fatal failure of `MSBuildLocator`
- Fixed missing MSBuild registration when using `ProjectExtensions`
- Fixed `NuGetPackageResolver` performance by reading metadata from `.nuspec` files
- Fixed `GitRepository` initialization when remote is not set
- Fixed exception for duplicated keys in TeamCity property files
- Fixed missing arguments for `DotNetTasks`

## [6.0.3] / 2022-05-02
- Fixed exception handling in various places
- Fixed shell-completion file to be written after parameter resolution
Expand Down Expand Up @@ -913,7 +935,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Added CLT tasks for Git
- Fixed background color in console output

[vNext]: https://github.com/nuke-build/nuke/compare/6.0.3...HEAD
[vNext]: https://github.com/nuke-build/nuke/compare/6.1.0...HEAD
[6.1.0]: https://github.com/nuke-build/nuke/compare/6.0.3...6.1.0
[6.0.3]: https://github.com/nuke-build/nuke/compare/6.0.2...6.0.3
[6.0.2]: https://github.com/nuke-build/nuke/compare/6.0.1...6.0.2
[6.0.1]: https://github.com/nuke-build/nuke/compare/6.0.0...6.0.1
Expand Down
30 changes: 0 additions & 30 deletions Jenkinsfile

This file was deleted.

12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<img width="400px" src="https://github.com/nuke-build/nuke/raw/develop/images/logo-black.png" />
<img width="400px" src="https://github.com/nuke-build/nuke/raw/develop/images/logo-black.png#gh-light-mode-only" />
<img width="400px" src="https://github.com/nuke-build/nuke/raw/develop/images/logo-white.png#gh-dark-mode-only" />

> The AKEless Build System for C#/.NET
Expand Down Expand Up @@ -70,7 +71,7 @@ NUKE builds and tests itself on several different CI servers, which helps ensuri

- [ASP.NET Boilerplate](https://aspnetboilerplate.com/) <sup><a href="https://github.com/aspnetboilerplate/aspnetboilerplate">1</a></sup>
- [AvaloniaUI](https://avaloniaui.net/) <sup><a href="https://github.com/AvaloniaUI/Avalonia">1</a></sup>
- **[Aviva Solutions Inc.](https://www.avivasolutions.com/)** <sup><a href="https://github.com/avivasolutionsnl/sitecore-commerce-docker">1</a> <a href="https://github.com/avivasolutionsnl/sitecore-docker">2</a></sup>
- **[Aviva Solutions B.V.](https://www.avivasolutions.nl/)** <sup><a href="https://github.com/avivasolutionsnl/sitecore-commerce-docker">1</a> <a href="https://github.com/avivasolutionsnl/sitecore-docker">2</a></sup>
- [ChilliCream](https://chillicream.com/) <sup><a href="https://github.com/ChilliCream/hotchocolate">1</a></sup>
- [CsvHelper](https://joshclose.github.io/CsvHelper/) <sup><a href="https://github.com/JoshClose/CsvHelper">1</a></sup>
- [DNN Community](https://dnncommunity.org/) <sup><a href="https://github.com/DNNCommunity/Dnn.ModuleCreator">1</a></sup>
Expand Down Expand Up @@ -101,6 +102,7 @@ Thanks to all companies, organizations, and individuals who are sponsoring the f
[![Anton Wieslander](https://avatars.githubusercontent.com/T0shik?s=60&v=4)](https://github.com/T0shik)
[![Chase Florell](https://avatars.githubusercontent.com/ChaseFlorell?s=60&v=4)](https://github.com/ChaseFlorell)
[![business//acts](https://avatars.githubusercontent.com/BusinessActs?s=60&v=4)](https://github.com/BusinessActs)
[![xsegno GmbH](https://avatars.githubusercontent.com/xsegno?s=60&v=4)](https://github.com/xsegno)

[![Stephan Müller](https://avatars.githubusercontent.com/chaquotay?s=45&v=4)](https://github.com/chaquotay)
[![Bitbonk](https://avatars.githubusercontent.com/bitbonk?s=45&v=4)](https://github.com/bitbonk)
Expand All @@ -112,11 +114,9 @@ Thanks to all companies, organizations, and individuals who are sponsoring the f
[![Martin Gill](https://avatars.githubusercontent.com/MartinSGill?s=45&v=4)](https://github.com/MartinSGill)
[![Trey Cook](https://avatars.githubusercontent.com/hfcook3?s=45&v=4)](https://github.com/hfcook3)
[![Todor Todorov](https://avatars.githubusercontent.com/totollygeek?s=45&v=4)](https://github.com/totollygeek)
[![Christian Sindberg](https://avatars.githubusercontent.com/chrsin?s=45&v=4)](https://github.com/chrsin)
[![Andrei Andreev](https://avatars.githubusercontent.com/Razenpok?s=45&v=4)](https://github.com/Razenpok)
[![Steven Kuhn](https://avatars.githubusercontent.com/stevenkuhn?s=45&v=4)](https://github.com/stevenkuhn)
[![Jesus Rodriguez Valencia](https://avatars.githubusercontent.com/jrodrigv?s=45&v=4)](https://github.com/jrodrigv)
[![Влалислав Лищина](https://avatars.githubusercontent.com/Duskone39?s=45&v=4)](https://github.com/Duskone39)
[![Adam Renaud](https://avatars.githubusercontent.com/rena0157?s=45&v=4)](https://github.com/rena0157)
[![Vezel](https://avatars.githubusercontent.com/vezel-dev?s=45&v=4)](https://github.com/vezel-dev)

## Technology Sponsors

Expand Down
3 changes: 3 additions & 0 deletions appveyor.continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ branches:

skip_tags: true

install:
- git submodule update --init --recursive

build_script:
- cmd: .\build.cmd Test Pack
- sh: ./build.cmd Test Pack
Expand Down
3 changes: 3 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ branches:

skip_tags: true

install:
- git submodule update --init --recursive

build_script:
- cmd: .\build.cmd Pack Test SignPackages Publish
- sh: ./build.cmd Pack Test SignPackages Publish
Expand Down
Loading

0 comments on commit 4a24cd4

Please sign in to comment.