Skip to content

Commit 4321c87

Browse files
AdmiringWormAdmiringWorm
authored
Merge pull request #3820 from chocolatey/release/2.6.0
(release) 2.6.0
2 parents 76a301e + 0179aad commit 4321c87

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1457
-573
lines changed

‎.github/labels.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
- name: "Package Issue"
2+
color: "EB6420"
3+
description: "Issues that are related directly to packages, and no changes to Chocolatey CLI is required."
4+
- name: "PowerShell Internal Host"
5+
color: "D4C5F9"
6+
description: "Issues related to how Chocolatey CLI spawns a PowerShell Host to execute the packaging scripts."
7+
- name: "Dependency - Chocolatey.NuGet.Client"
8+
color: "E10D60"
9+
description: "Issues that require a modification to something in the referenced NuGet.Client libraries."
10+
aliases: ["Requires NuGet.Client Change"]
11+
- name: "Dependency - shimgen"
12+
color: "FBCA04"
13+
description: "Issues related to the Shim Generator (shimgen) dependency which Chocolatey CLI makes use of."
14+
aliases: ["shimgen"]

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Sync labels
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
# Run at the end of the day (most likely UTC)
6+
- cron: "0 0 * * *"
7+
push:
8+
branches:
9+
- main
10+
- master
11+
- develop
12+
paths:
13+
- '.github/workflows/label-sync.yml'
14+
- '.github/labels.yml'
15+
16+
jobs:
17+
labels:
18+
# We use ubuntu as the image, as it is typically faster and cheaper (on private repos).
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
# uncomment the uses line if additional configuration in the current
23+
# repository is used.
24+
- uses: actions/checkout@v4
25+
with:
26+
sparse-checkout: .github/labels.yml
27+
- uses: EndBug/label-sync@v2
28+
with:
29+
config-file: |
30+
https://raw.githubusercontent.com/chocolatey/.github/main/.github/labels.yml
31+
.github/labels.yml
32+
request-token: ${{ secrets.SYNC_TOKEN }} # Used when getting the config files.
33+
delete-other-labels: true # After initial run, and verification change this to true
34+
dry-run: false
35+
token: ${{ secrets.SYNC_TOKEN }} # Used when updating the labels on the repository.
36+

‎.github/workflows/top-issues.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
name: Top Issues Action
1+
name: Top Votes Action
22
on:
33
workflow_dispatch:
44
schedule:
55
- cron: '12 05 */1 * *'
66

77
jobs:
88
ShowTopIssues:
9-
name: Display top issues
9+
name: Display top votes
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: Run top issues action
13-
uses: rickstaa/top-issues-action@v1.3.101
12+
- name: Run top votes action
13+
uses: pauby/top-votes-action@v1
1414
env:
1515
github_token: ${{ secrets.GITHUB_TOKEN }}
1616
with:
@@ -23,5 +23,4 @@ jobs:
2323
top_bugs: true
2424
bug_label: "Bug"
2525
top_features: true
26-
feature_label: "Enhancement"
27-
custom_label: "Improvement"
26+
feature_label: "Enhancement"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<a href="{{contributor.html_url}}"><img src="{{contributor.avatar_url}}" alt="{{contributor.login}}" height="32" width="32"/></a>
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
__Contributors__
3+
### Contributors
44

55
{{ contributors.count }} contributors made this release possible.
66

‎.templates/contributors/index.sbn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{-
22
include 'release-info'
3-
if milestone.target.description
3+
if milestone.target.description != ""
44
include 'milestone'
55
end
66
include 'issues' | string.rstrip

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### {{ issue_label }}
2-
32
{{ for issue in issues.items[issue_label]
43
include 'issue-note'
54
end }}
5+

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{{
22
func IssueDescription
33
if $0.is_pull_request
4-
$description = "[__!" + $0.public_number + "__]"
4+
$description = "[!" + $0.public_number + "]"
55
else
6-
$description = "[__#" + $0.public_number + "__]"
6+
$description = "[#" + $0.public_number + "]"
77
end
88
$description = $description + "(" + $0.html_url + ")"
99
if $1
10-
$description = $0.title + " - see " + $description
10+
$description = $0.title + "." + "\n - See " + $description
1111
end
1212
if $0.user
1313
$description = $description + " by [" + $0.user.login + "](" + $0.user.html_url + ")"
@@ -23,7 +23,7 @@ func LinkedIssuesDescription
2323
for linkedIssue in $0
2424
if linkedIssue.is_pull_request
2525
if $countPRs == 0
26-
$resolvedBy = " resolved in "
26+
$resolvedBy = ", resolved in "
2727
else
2828
$resolvedBy = $resolvedBy + ", "
2929
end

‎Invoke-Tests.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ try {
160160
'WIP'
161161
'NonAdmin'
162162
'Internal'
163+
'CCROnly'
163164
if (-not $env:VM_RUNNING -and -not $env:TEST_KITCHEN) {
164165
'VMOnly'
165166
}

‎docker/Dockerfile.linux‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RUN if [ "$buildscript" = "build.official.sh" ]; then \
2929
cp docker/choco_wrapper code_drop/temp/_PublishedApps/choco/choco_wrapper; \
3030
fi;
3131

32-
3332
FROM debian:bookworm AS install
3433

3534
RUN apt update; \
@@ -58,4 +57,4 @@ RUN mkdir /opt/chocolatey/lib; \
5857
cp /opt/chocolatey/choco_wrapper usr/local/bin/choco; \
5958
cp /opt/chocolatey/choco_wrapper usr/local/bin/choco.exe;
6059

61-
WORKDIR /root
60+
WORKDIR /root

0 commit comments

Comments
 (0)