Skip to content

Commit d08e5cc

Browse files
vexx32vexx32
authored
Merge pull request #61 from chocolatey/release/3.5.0
(release) 3.5.0
2 parents 7efb712 + 0647c21 commit d08e5cc

32 files changed

+214
-21
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<!--
22
BEFORE YOU CREATE A PULL REQUEST:
33
4-
Ensure you have read over [CONTRIBUTING.md](./CONTRIBUTING.md). We provide VERY defined guidance (as such, we strongly adhere to it).
4+
Ensure you have read over [CONTRIBUTING.md](https://github.com/chocolatey/choco/blob/develop/CONTRIBUTING.md). We provide VERY defined guidance (as such, we strongly adhere to it).
55
66
A summary of our expectations:
77
- You are not submitting a pull request from your MASTER / MAIN branch.
88
- You are able to sign the Contributor License Agreement (CLA).
99
- YOUR GIT COMMIT MESSAGE FORMAT IS EXTREMELY IMPORTANT. We have a very defined expectation for this format and are sticklers about it. Really, READ the entire Contributing document. It will save you and us pain.
1010
- Do not reformat code, it makes it hard to see what has changed. Leave the formatting to us.
11+
- You have read and can confirm the completion of the [Definition of Done](https://github.com/chocolatey/home/blob/main/definition-of-done.md).
1112
1213
THANKS! We appreciate you reading the entire Contributing document and not just scanning through it.
1314
@@ -36,8 +37,8 @@ Please remove all comments before submitting.
3637
-->
3738
### Operating Systems Testing
3839
<!-- If this is a code change, list the operating systems this has been tested on
39-
- Windows Server 2008R2
40-
- Windows 8.1
40+
- Windows Server 2019
41+
- Windows 10
4142
...
4243
-->
4344

@@ -56,7 +57,8 @@ Please remove all comments before submitting.
5657
* [ ] Documentation has been updated.
5758
* [ ] Tests to cover my changes, have been added.
5859
* [ ] All new and existing tests passed?
59-
* [ ] PowerShell code changes: PowerShell v2 compatibility checked?
60+
* [ ] PowerShell code changes: PowerShell v3 compatibility checked?
61+
* [ ] All items are complete on the [Definition of Done](https://github.com/chocolatey/home/blob/main/definition-of-done.md).
6062

6163
## Related Issue
6264
<!-- Make sure you have raised an issue for this pull request before

‎.github/workflows/label-sync.yml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,32 @@ on:
44
schedule:
55
# Run at the end of the day (most likely UTC)
66
- cron: "0 0 * * *"
7+
push:
8+
branches:
9+
- main
10+
- master
11+
- develop
12+
paths:
13+
- '.github/workflows/label-sync.yml'
14+
# Uncomment the following line if using a repository specific label file, also remove this comment line
15+
# - '.github/labels.yml'
716

817
jobs:
918
labels:
1019
# We use ubuntu as the image, as it is typically faster and cheaper (on private repos).
1120
runs-on: ubuntu-latest
1221

1322
steps:
14-
# uncomment the uses line if additional configuration in the current
15-
# repository is used.
16-
#- uses: actions/checkout@v3.0.2
17-
- uses: EndBug/label-sync@v2.3.2
23+
# Uncomment the following uses statement block if using a repository specific label file, also remove this comment line
24+
#- uses: actions/checkout@v4
25+
# with:
26+
# sparse-checkout: .github/labels.yml
27+
- uses: EndBug/label-sync@v2
1828
with:
1929
config-file: |
2030
https://raw.githubusercontent.com/chocolatey/.github/main/.github/labels.yml
31+
# Uncomment the following line if using a repository specific label file, also remove this comment line
32+
# .github/labels.yml
2133
request-token: ${{ secrets.SYNC_TOKEN }} # Used when getting the config files.
2234
delete-other-labels: true # After initial run, and verification change this to true
2335
dry-run: false

‎.teamcity/settings.kts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ project {
1111
object ChocolateyNugetClient : BuildType({
1212
name = "Build"
1313

14+
templates(AbsoluteId("SlackNotificationTemplate"))
15+
1416
artifactRules = """
1517
+:artifacts/nupkgs/*.nupkg
1618
-:artifacts/nupkgs/*.symbols.nupkg
@@ -37,19 +39,21 @@ object ChocolateyNugetClient : BuildType({
3739
if ((Get-WindowsFeature -Name NET-Framework-Features).InstallState -ne 'Installed') {
3840
Install-WindowsFeature -Name NET-Framework-Features
3941
}
40-
42+
4143
choco install visualstudio2022-workload-manageddesktopbuildtools visualstudio2022-workload-visualstudioextensionbuildtools visualstudio2022-component-texttemplating-buildtools --confirm --no-progress
42-
44+
4345
exit ${'$'}LastExitCode
4446
""".trimIndent()
4547
}
4648
}
49+
4750
powerShell {
4851
name = "Configure .NET and other dependencies"
4952
scriptMode = file {
5053
path = "configure.ps1"
5154
}
5255
}
56+
5357
powerShell {
5458
name = "Build"
5559
scriptMode = script {
@@ -64,11 +68,12 @@ object ChocolateyNugetClient : BuildType({
6468
elseif ( ${'$'}branchName.StartsWith('proj') ) { ${'$'}releaseLabel = 'alpha' }
6569
elseif ( ${'$'}branchName.StartsWith('bugfix') ) { ${'$'}releaseLabel = 'beta' }
6670
elseif ( ${'$'}branchName.StartsWith('pull') ) { ${'$'}releaseLabel = 'pr' }
67-
71+
6872
.\build.ps1 -CI -SkipUnitTest -ChocolateyBuild -BuildNumber %build.counter% -ReleaseLabel ${'$'}releaseLabel -BuildDate (Get-Date -Format "yyyyMMdd")
6973
""".trimIndent()
7074
}
7175
}
76+
7277
powerShell {
7378
conditions {
7479
doesNotContain("teamcity.build.branch", "pull")

‎.templates/contributors/contributor-details.sbn‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<a href="{{contributor.html_url}}"><img src="{{contributor.avatar_url}}" alt="Profile image for contributor {{contributor.login}}" height="32" width="32"/></a>

‎.templates/contributors/contributors.sbn‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
3+
### Contributors
4+
5+
{{ contributors.count }} contributors made this release possible.
6+
7+
{{ for contributor in contributors.items
8+
include 'contributor-details'
9+
end }}

‎.templates/contributors/create/footer.sbn‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{{ if config.create.include_footer }}
2+
3+
### {{ config.create.footer_heading }}
4+
5+
{{ if config.create.milestone_replace_text
6+
replace_milestone_title config.create.footer_content config.create.milestone_replace_text milestone.target.title
7+
else
8+
config.create.footer_content
9+
end
10+
end }}

‎.templates/contributors/index.sbn‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{-
2+
include 'release-info'
3+
if milestone.target.description != ""
4+
include 'milestone'
5+
end
6+
include 'issues' | string.rstrip
7+
if contributors.count > 0
8+
include 'contributors'
9+
end
10+
if template_kind == "CREATE"
11+
include 'create/footer'
12+
end
13+
~}}

‎.templates/contributors/issue-details.sbn‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
### {{ issue_label }}
2+
{{ for issue in issues.items[issue_label]
3+
include 'issue-note'
4+
end }}
5+

‎.templates/contributors/issue-note.sbn‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{{
2+
func IssueDescription
3+
if $0.is_pull_request
4+
$description = "[!" + $0.public_number + "]"
5+
else
6+
$description = "[#" + $0.public_number + "]"
7+
end
8+
$description = $description + "(" + $0.html_url + ")"
9+
if $1
10+
$description = $0.title + "." + "\n - See " + $description
11+
end
12+
if $0.user
13+
$description = $description + " by [" + $0.user.login + "](" + $0.user.html_url + ")"
14+
end
15+
if $0.linked_issues
16+
$description = $description + LinkedIssuesDescription($0.linked_issues) + "."
17+
end
18+
ret $description
19+
end
20+
func LinkedIssuesDescription
21+
$countPRs = 0
22+
$countIssues = 0
23+
for linkedIssue in $0
24+
if linkedIssue.is_pull_request
25+
if $countPRs == 0
26+
$resolvedBy = ", resolved in "
27+
else
28+
$resolvedBy = $resolvedBy + ", "
29+
end
30+
$resolvedBy = $resolvedBy + IssueDescription(linkedIssue, false)
31+
$countPRs = $countPRs + 1
32+
else
33+
if $countIssues == 0
34+
$raisedIn = " raised in "
35+
else
36+
$raisedIn = $raisedIn + ", "
37+
end
38+
$raisedIn = $raisedIn + IssueDescription(linkedIssue, false)
39+
$countIssues = $countIssues + 1
40+
end
41+
end
42+
ret $raisedIn + $resolvedBy
43+
end
44+
}}
45+
- {{ IssueDescription(issue, true) }}

‎.templates/contributors/issues.sbn‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
{{ for issue_label in issue_labels
3+
include 'issue-details'
4+
end }}

0 commit comments

Comments
 (0)