Skip to content

Commit

Permalink
Merge branch 'release/6.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
matkoch committed Jan 7, 2022
2 parents 068ce4b + 1b33926 commit 02a1058
Show file tree
Hide file tree
Showing 688 changed files with 12,444 additions and 3,943 deletions.
59 changes: 44 additions & 15 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
name: 🐞 Bug Report
description: "Requires Sponsorship πŸ’–"
description: "Report something that doesn't look alright"
labels: "bug :beetle:"
body:
- type: markdown
attributes:
value: "***Important:** To create a bug report, you must be an active supporter of our community, i.e., a sponsor of NUKE on [GitHub](https://github.com/sponsors/matkoch)/[OpenCollective](https://opencollective.com/nuke), a frequent blogger/mentor, or greatly involved in any other recognized OSS project. High-impact bugs may be reported at any time. Please don't take offense at this, particularly when an issue is closed with reference to this text. It is simply a time management decision. Also note, that unless being a bronze/silver/gold sponsor, there is no guarantee as of when an issue or pull-request will be acknowledged or resolved.*"

- type: input
id: usage-information
attributes:
Expand All @@ -15,27 +11,60 @@ body:
required: true

- type: textarea
id: description
attributes:
label: Relevant Code / Invocations
description: What part of your build or build invocation seems relevant?
render: code
label: Description
description: Please share a clear and concise description of the problem.
placeholder: Description
validations:
required: true

- type: textarea
id: reproduction-steps
attributes:
label: Reproduction Steps
description: |
Please include minimal steps to reproduce the problem if possible. E.g.: the smallest possible code snippet; or a small project, with steps to run it. If possible include text as text rather than screenshots (so it shows up in searches).
placeholder: Minimal Reproduction
validations:
required: true

- type: textarea
id: expected-behavior
attributes:
label: Expected Behavior
description: What did you expect to happen?
description: |
Provide a description of the expected behavior.
placeholder: Expected Behavior
validations:
required: true

- type: textarea
id: actual-behavior
attributes:
label: What actually happened?
placeholder: You may skip this if a stacktrace is provided in the next field.
label: Actual Behavior
description: |
Provide a description of the actual behavior observed. If applicable please include any error messages or exception stacktraces.
placeholder: Actual Behavior
validations:
required: true

- type: textarea
id: stacktrace
id: regression
attributes:
label: Stacktrace / Log
render: code
label: Regression?
description: |
Did this work in a previous build or release of NUKE? If you can try a previous release, which would help us narrow down the problem. If you don't know, that's OK.
placeholder: Regression?
validations:
required: false

- type: textarea
id: known-workarounds
attributes:
label: Anything else we should know?
label: Known Workarounds
description: |
Please provide a description of any known workarounds.
placeholder: Known Workarounds
validations:
required: false
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ contact_links:
about: Get in touch with the whole community
- name: 🐦 Follow on Twitter
url: https://twitter.com/nukebuildnet
about: Stay informed about the latest greatness
about: Stay informed about the latest greatness
6 changes: 1 addition & 5 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
name: ✨ Feature Request
description: "Requires Sponsorship πŸ’–"
description: "Suggest new features for the project"
labels: "enhancement :sparkles:"
body:
- type: markdown
attributes:
value: "***Important:** To create a feature request, you must be an active supporter of our community, i.e., a sponsor of NUKE on [GitHub](https://github.com/sponsors/matkoch)/[OpenCollective](https://opencollective.com/nuke), a frequent blogger/mentor, or greatly involved in any other recognized OSS project. Ideas may be discussed openly on [Slack](https://slofile.com/slack/nukebuildnet) at any time. Please don't take offense at this, particularly when an issue is closed with reference to this text. It is simply a time management decision. Also note, that unless being a bronze/silver/gold sponsor, there is no guarantee as of when an issue or pull-request will be acknowledged or resolved.*"

- type: textarea
attributes:
label: Description
Expand Down
12 changes: 12 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!-- Thanks for your contribution! -->
<!-- Please describe what you did below this line -->



<!-- Make sure to tick all the boxes if possible -->

I confirm that the pull-request:

- [ ] Follows the contribution guidelines
- [ ] Is based on my own work
- [ ] Is in compliance with my employer
9 changes: 3 additions & 6 deletions .github/workflows/continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ jobs:
- name: Run './build.cmd Test Pack'
run: ./build.cmd Test Pack
env:
EnterpriseAccessToken: ${{ secrets.ENTERPRISE_ACCESS_TOKEN }}
SlackUserAccessToken: ${{ secrets.SLACK_USER_ACCESS_TOKEN }}
GITHUB_CONTEXT: ${{ toJSON(github) }}
ubuntu-latest:
name: ubuntu-latest
runs-on: ubuntu-latest
Expand All @@ -58,8 +57,7 @@ jobs:
- name: Run './build.cmd Test Pack'
run: ./build.cmd Test Pack
env:
EnterpriseAccessToken: ${{ secrets.ENTERPRISE_ACCESS_TOKEN }}
SlackUserAccessToken: ${{ secrets.SLACK_USER_ACCESS_TOKEN }}
GITHUB_CONTEXT: ${{ toJSON(github) }}
macOS-latest:
name: macOS-latest
runs-on: macOS-latest
Expand All @@ -75,5 +73,4 @@ jobs:
- name: Run './build.cmd Test Pack'
run: ./build.cmd Test Pack
env:
EnterpriseAccessToken: ${{ secrets.ENTERPRISE_ACCESS_TOKEN }}
SlackUserAccessToken: ${{ secrets.SLACK_USER_ACCESS_TOKEN }}
GITHUB_CONTEXT: ${{ toJSON(github) }}
21 changes: 5 additions & 16 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
"AutoStash": {
"type": "boolean"
},
"AzurePipelinesAccessToken": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secret [profile]'"
},
"CodecovToken": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secret [profile]'"
Expand All @@ -28,18 +24,10 @@
"type": "boolean",
"description": "Indicates to continue a previously failed build attempt"
},
"EnterpriseAccessToken": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secret [profile]'"
},
"GitHubRegistryApiKey": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secret [profile]'"
},
"GitHubToken": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secret [profile]'"
},
"GitterAuthToken": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secret [profile]'"
Expand Down Expand Up @@ -79,6 +67,9 @@
"type": "boolean",
"description": "Ignore unreachable sources during Restore"
},
"Major": {
"type": "boolean"
},
"NoLogo": {
"type": "boolean",
"description": "Disables displaying the NUKE logo"
Expand Down Expand Up @@ -130,6 +121,7 @@
"CheckoutExternalRepositories",
"Clean",
"Compile",
"DownloadLicenses",
"GenerateGlobalSolution",
"GeneratePublicApi",
"GenerateTools",
Expand All @@ -152,10 +144,6 @@
]
}
},
"SlackUserAccessToken": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secret [profile]'"
},
"SlackWebhook": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secret [profile]'"
Expand All @@ -175,6 +163,7 @@
"CheckoutExternalRepositories",
"Clean",
"Compile",
"DownloadLicenses",
"GenerateGlobalSolution",
"GeneratePublicApi",
"GenerateTools",
Expand Down
2 changes: 1 addition & 1 deletion .space.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ job("continuous") {
}
}

container("mcr.microsoft.com/dotnet/sdk:5.0") {
container("mcr.microsoft.com/dotnet/sdk:6.0") {
shellScript {
content = "./build.sh Test"
}
Expand Down
27 changes: 27 additions & 0 deletions .teamcity/patches/projects/_Self.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package patches.projects

import jetbrains.buildServer.configs.kotlin.v2018_1.*
import jetbrains.buildServer.configs.kotlin.v2018_1.Project
import jetbrains.buildServer.configs.kotlin.v2018_1.ui.*

/*
This patch script was generated by TeamCity on settings change in UI.
To apply the patch, change the root project
accordingly, and delete the patch script.
*/
changeProject(DslContext.projectId) {
params {
expect {
password("env.EnterpriseAccessToken", "", label = "EnterpriseAccessToken")
}
update {
password("env.EnterpriseAccessToken", "credentialsJSON:02c23844-4f9a-49c2-95a6-320497f8abc3", label = "EnterpriseAccessToken", readOnly = true)
}
expect {
password("env.SlackUserAccessToken", "", label = "SlackUserAccessToken")
}
update {
password("env.SlackUserAccessToken", "credentialsJSON:40784596-735c-4e57-98d4-5f8b1894fedb", label = "SlackUserAccessToken")
}
}
}
33 changes: 15 additions & 18 deletions .teamcity/settings.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import jetbrains.buildServer.configs.kotlin.v2018_1.buildSteps.*
import jetbrains.buildServer.configs.kotlin.v2018_1.triggers.*
import jetbrains.buildServer.configs.kotlin.v2018_1.vcs.*

version = "2020.2"
version = "2021.2"

project {
buildType(Pack)
Expand All @@ -47,11 +47,6 @@ project {
value = "Release",
options = listOf("Debug" to "Debug", "Release" to "Release"),
display = ParameterDisplay.NORMAL)
password (
"env.EnterpriseAccessToken",
label = "EnterpriseAccessToken",
value = "",
display = ParameterDisplay.NORMAL)
text (
"env.GitterRoomId",
label = "GitterRoomId",
Expand All @@ -66,6 +61,13 @@ project {
checked = "True",
unchecked = "False",
display = ParameterDisplay.NORMAL)
checkbox (
"env.Major",
label = "Major",
value = "False",
checked = "True",
unchecked = "False",
display = ParameterDisplay.NORMAL)
text (
"env.SignPathOrganizationId",
label = "SignPathOrganizationId",
Expand All @@ -84,11 +86,6 @@ project {
value = "nuke",
allowEmpty = true,
display = ParameterDisplay.NORMAL)
password (
"env.SlackUserAccessToken",
label = "SlackUserAccessToken",
value = "",
display = ParameterDisplay.NORMAL)
checkbox (
"env.UseHttps",
label = "UseHttps",
Expand All @@ -114,7 +111,7 @@ project {
}
}
object Pack : BuildType({
name = "πŸ“¦ Pack 🧩 "
name = "πŸ“¦ Pack"
vcs {
root(DslContext.settingsRoot)
cleanCheckout = true
Expand All @@ -123,12 +120,12 @@ object Pack : BuildType({
steps {
exec {
path = "build.cmd"
arguments = "Restore Compile Pack --skip"
arguments = "Restore DownloadLicenses Compile Pack --skip"
conditions { contains("teamcity.agent.jvm.os.name", "Windows") }
}
exec {
path = "build.sh"
arguments = "Restore Compile Pack --skip"
arguments = "Restore DownloadLicenses Compile Pack --skip"
conditions { doesNotContain("teamcity.agent.jvm.os.name", "Windows") }
}
}
Expand Down Expand Up @@ -191,7 +188,7 @@ object Test_P2T2 : BuildType({
}
})
object Test : BuildType({
name = "🚦 Test 🧩 "
name = "🚦 Test"
type = Type.COMPOSITE
vcs {
root(DslContext.settingsRoot)
Expand Down Expand Up @@ -228,7 +225,7 @@ object Test : BuildType({
}
})
object ReportDuplicates : BuildType({
name = "🎭 ReportDuplicates 🧩 "
name = "🎭 ReportDuplicates"
vcs {
root(DslContext.settingsRoot)
cleanCheckout = true
Expand Down Expand Up @@ -258,7 +255,7 @@ object ReportDuplicates : BuildType({
}
})
object ReportIssues : BuildType({
name = "πŸ’£ ReportIssues 🧩 "
name = "πŸ’£ ReportIssues"
vcs {
root(DslContext.settingsRoot)
cleanCheckout = true
Expand Down Expand Up @@ -288,7 +285,7 @@ object ReportIssues : BuildType({
}
})
object ReportCoverage : BuildType({
name = "πŸ“Š ReportCoverage 🧩 "
name = "πŸ“Š ReportCoverage"
vcs {
root(DslContext.settingsRoot)
cleanCheckout = true
Expand Down
Loading

0 comments on commit 02a1058

Please sign in to comment.