Skip to content

Commit

Permalink
Merge pull request chocolatey#3559 from chocolatey/release/2.4.0
Browse files Browse the repository at this point in the history
(release) 2.4.0
  • Loading branch information
gep13 authored Nov 12, 2024
2 parents 781d36f + 8253217 commit c704807
Show file tree
Hide file tree
Showing 104 changed files with 5,634 additions and 1,314 deletions.
184 changes: 0 additions & 184 deletions .editorconfig

This file was deleted.

9 changes: 5 additions & 4 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4.1.0
- uses: actions/stale@v9
id: stale
with:
days-before-stale: 30
Expand All @@ -24,9 +24,10 @@ jobs:
only-labels: '0 - Waiting on User'
close-issue-label: "No Response / Stale"
close-pr-label: "No Response / Stale"
exempt-issue-labels: 'Security / CVE'
exempt-pr-labels: 'Security / CVE'
labels-to-remove-when-unstale: '0 - Wating on User,Pending closure'
exempt-issue-labels: 'Security / CVE,2 - Working,3 - Review'
exempt-pr-labels: 'Security / CVE,2 - Working,3 - Review'
labels-to-remove-when-unstale: '0 - Waiting on User,Pending closure'
remove-stale-when-updated: true
stale-issue-message: |
Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?
This issue will be closed in 14 days if it continues to be inactive.
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ code_drop
obj
src/packages
/.vscode/**
!.vscode/extensions.json
!/.vscode/settings.json
.vs

Expand Down Expand Up @@ -53,4 +54,7 @@ tools/**
!tools/Modules/packages.config
BuildArtifacts/
code_drop/
src/chocolatey.install/assets/Install.ps1
src/chocolatey.install/assets/Install.ps1

# This project uses an editorconfig file maintained via a nuget package, so do not commit any of these to the repo
.editorconfig
18 changes: 18 additions & 0 deletions .teamcity/settings.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ object Chocolatey : BuildType({
id = AbsoluteId("Chocolatey")
name = "Chocolatey CLI (Built with Unit Tests)"

templates(AbsoluteId("SlackNotificationTemplate"))

artifactRules = """
""".trimIndent()

Expand Down Expand Up @@ -86,13 +88,16 @@ object Chocolatey : BuildType({

requirements {
doesNotExist("docker.server.version")
doesNotContain("teamcity.agent.name", "Docker")
}
})

object ChocolateySchd : BuildType({
id = AbsoluteId("ChocolateySchd")
name = "Chocolatey CLI (Scheduled Integration Testing)"

templates(AbsoluteId("SlackNotificationTemplate"))

artifactRules = """
""".trimIndent()

Expand Down Expand Up @@ -150,13 +155,16 @@ object ChocolateySchd : BuildType({

requirements {
doesNotExist("docker.server.version")
doesNotContain("teamcity.agent.name", "Docker")
}
})

object ChocolateyQA : BuildType({
id = AbsoluteId("ChocolateyQA")
name = "Chocolatey CLI (SonarQube)"

templates(AbsoluteId("SlackNotificationTemplate"))

artifactRules = """
""".trimIndent()

Expand Down Expand Up @@ -216,13 +224,16 @@ object ChocolateyQA : BuildType({

requirements {
doesNotExist("docker.server.version")
doesNotContain("teamcity.agent.name", "Docker")
}
})

object ChocolateySign : BuildType({
id = AbsoluteId("ChocolateySign")
name = "Chocolatey CLI (Script Signing)"

templates(AbsoluteId("SlackNotificationTemplate"))

artifactRules = """
""".trimIndent()

Expand Down Expand Up @@ -286,13 +297,16 @@ object ChocolateySign : BuildType({

requirements {
doesNotExist("docker.server.version")
doesNotContain("teamcity.agent.name", "Docker")
}
})

object ChocolateyDockerWin : BuildType({
id = AbsoluteId("ChocolateyDockerWin")
name = "Docker (Windows)"

templates(AbsoluteId("SlackNotificationTemplate"))

params {
// TeamCity has suggested "${Chocolatey.depParamRefs.buildNumber}"
param("env.CHOCOLATEY_VERSION", "%dep.Chocolatey.build.number%")
Expand Down Expand Up @@ -340,13 +354,16 @@ object ChocolateyDockerWin : BuildType({
requirements {
contains("docker.server.osType", "windows")
exists("docker.server.version")
contains("teamcity.agent.name", "Docker")
}
})

object ChocolateyPosix : BuildType({
id = AbsoluteId("ChocolateyPosix")
name = "Docker (Linux)"

templates(AbsoluteId("SlackNotificationTemplate"))

params {
param("env.CAKE_NUGET_SOURCE", "") // The Cake version we use has issues with authing to our private source on Linux
param("env.PRIMARY_NUGET_SOURCE", "") // As above there are issues with authing to our private source on Linux
Expand Down Expand Up @@ -452,5 +469,6 @@ object ChocolateyPosix : BuildType({
requirements {
contains("docker.server.osType", "linux")
exists("docker.server.version")
contains("teamcity.agent.name", "Docker")
}
})
5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"yzhang.markdown-all-in-one"
]
}
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"[powershell]": {
"files.encoding": "utf8bom",
}
},
"markdown.extension.toc.levels": "2..6"
}
Loading

0 comments on commit c704807

Please sign in to comment.