Skip to content

Commit

Permalink
Merge branch 'release/3.4.3'
Browse files Browse the repository at this point in the history
* release/3.4.3:
  (build) Changed to build v3.4.3
  (#51) Remove hard coded entry for starts with
  (maint) synced local '.templates/' with remote '.github/GitReleaseManager/.templates/'
  (maint) Enable deleting old labels
  (maint) synced local '.github/PULL_REQUEST_TEMPLATE.md' with remote '.github/PULL_REQUEST_TEMPLATE.md'
  (maint) created local '.github/workflows/label-sync.yml' from remote '.github/workflows/label-sync.yml'
  (maint) synced local '.templates/' with remote '.github/GitReleaseManager/.templates/'
  (maint) Update GRM configuration
  (maint) Make indentation consistent
  (maint) Make GRM config match template
  (maint) Fixing casing of GRM file
  (#44) Use parent directory for lock files location
  (build) Starting building 3.5.0 on develop branch
  • Loading branch information
AdmiringWorm committed Feb 26, 2025
2 parents 98878d8 + e73d365 commit ebe8b9b
Show file tree
Hide file tree
Showing 7 changed files with 119 additions and 53 deletions.
84 changes: 60 additions & 24 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,67 @@
<!-- DO NOT MODIFY OR DELETE THIS TEMPLATE. IT IS USED IN AUTOMATION. -->
## Bug
<!--
BEFORE YOU CREATE A PULL REQUEST:
<!-- Search https://github.com/NuGet/Home/issues, and create one if you can't find a suitable issue. -->
<!-- Paste the full link, like https://github.com/nuget/home/issues/1000. GitHub will render is neatly. -->
Fixes:
Ensure you have read over [CONTRIBUTING.md](./CONTRIBUTING.md). We provide VERY defined guidance (as such, we strongly adhere to it).
Regression? Last working version:
A summary of our expectations:
- You are not submitting a pull request from your MASTER / MAIN branch.
- You are able to sign the Contributor License Agreement (CLA).
- 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.
- Do not reformat code, it makes it hard to see what has changed. Leave the formatting to us.
## Description
<!-- Add details about the fix. Include any information that would help the maintainer review this change effective. -->
THANKS! We appreciate you reading the entire Contributing document and not just scanning through it.
## PR Checklist
Name your pull request appropriately: give it a sentence that reads well enough for anyone seeing this.
- [ ] PR has a meaningful title
- [ ] PR has a linked issue.
- [ ] Described changes
if you were explaining it to somebody else. This helps others to understand the reasons for the pull request and for it to be searchable in future.
- **Tests**
- [ ] Automated tests added
- **OR**
<!-- Describe why you haven't added automation. -->
- [ ] Test exception
- **OR**
- [ ] N/A <!-- Infrastructure, documentation etc. -->
Please do not remove any of the headings.
If a heading is not applicable then enter N/A: Why it's not applicable
- **Documentation**
<!-- Please link the PR/issue if appropriate -->
- [ ] Documentation PR or issue filled
- **OR**
- [ ] N/A
Make sure you have raised an issue for this pull request before continuing.
Please remove all comments before submitting.
-->

## Description Of Changes
<!-- Enter a description of the pull request changes -->

## Motivation and Context
<!-- Why is this change necessary and under what context is it being done -->

## Testing
<!-- How has this change been tested? If multiple different tests have been done please list them.
1. Tested this way
1. Tested that way
-->
### Operating Systems Testing
<!-- If this is a code change, list the operating systems this has been tested on
- Windows Server 2008R2
- Windows 8.1
...
-->

## Change Types Made
<!-- Tick the boxes for the type of changes that have been made -->

* [ ] Bug fix (non-breaking change).
* [ ] Feature / Enhancement (non-breaking change).
* [ ] Breaking change (fix or feature that could cause existing functionality to change).
* [ ] Documentation changes.
* [ ] PowerShell code changes.

## Change Checklist

* [ ] Requires a change to the documentation.
* [ ] Documentation has been updated.
* [ ] Tests to cover my changes, have been added.
* [ ] All new and existing tests passed?
* [ ] PowerShell code changes: PowerShell v2 compatibility checked?

## Related Issue
<!-- Make sure you have raised an issue for this pull request before
continuing. -->

Fixes #

<!-- PLEASE REMOVE ALL COMMENTS BEFORE SUBMITTING -->
24 changes: 24 additions & 0 deletions .github/workflows/label-sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Sync labels
on:
workflow_dispatch:
schedule:
# Run at the end of the day (most likely UTC)
- cron: "0 0 * * *"

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

steps:
# uncomment the uses line if additional configuration in the current
# repository is used.
#- uses: actions/[email protected]
- uses: EndBug/[email protected]
with:
config-file: |
https://raw.githubusercontent.com/chocolatey/.github/main/.github/labels.yml
request-token: ${{ secrets.SYNC_TOKEN }} # Used when getting the config files.
delete-other-labels: true # After initial run, and verification change this to true
dry-run: false
token: ${{ secrets.SYNC_TOKEN }} # Used when updating the labels on the repository.
7 changes: 6 additions & 1 deletion .templates/default/issue-note.sbn
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
- {{ issue.title }} - see [#{{ issue.number }}]({{ issue.html_url }}).
{{
if issue_label == "Bug" || issue_label == "Bug Fix" || issue_label == "Bug Fixes"
}}- Fix - {{ issue.title }} - see [#{{ issue.public_number }}]({{ issue.html_url }}).
{{ else
}}- {{ issue.title }} - see [#{{ issue.public_number }}]({{ issue.html_url }}).
{{ end -}}
4 changes: 2 additions & 2 deletions .templates/default/release-info.sbn
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{{
if issues.count > 0
if commits.count > 0
}}As part of this release we had [{{ commits.count }} {{ commits.count | string.pluralize "commit" "commits" }}]({{ commits.html_url }}) which resulted in [{{ issues.count }} {{ issues.count | string.pluralize "issue" "issues" }}]({{ milestone.target.html_url }}?closed=1) being closed.
}}As part of this release we had [{{ commits.count }} {{ commits.count | string.pluralize "commit" "commits" }}]({{ commits.html_url }}) which resulted in [{{ issues.count }} {{ issues.count | string.pluralize "issue" "issues" }}]({{ milestone.target.html_url }}?{{ milestone.query_string }}) being closed.
{{ else
}}As part of this release we had [{{ issues.count }} {{ issues.count | string.pluralize "issue" "issues" }}]({{ milestone.target.html_url }}?closed=1) closed.
}}As part of this release we had [{{ issues.count }} {{ issues.count | string.pluralize "issue" "issues" }}]({{ milestone.target.html_url }}?{{ milestone.query_string }}) closed.
{{ end
else if commits.count > 0
}}As part of this release we had [{{ commits.count }} {{ commits.count | string.pluralize "commit" "commits" }}]({{ commits.html_url }}).
Expand Down
49 changes: 25 additions & 24 deletions gitreleasemanager.yaml → GitReleaseManager.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
issue-labels-include:
- Breaking Change
- Deprecate
- Feature
- C4B Feature
- Bug
- Enhancement
- Documentation
- Breaking Change
- Deprecate
- Feature
- C4B Feature
- Bug
- Improvement
- Documentation
- Dependency Change
issue-labels-exclude:
- Internal Refactoring
- Build
- NO RELEASE NOTES
- Internal Refactoring
- BuildAutomation
- NO RELEASE NOTES
issue-labels-alias:
- name: Documentation
header: Documentation
plural: Documentation
- name: Bug
header: Bug Fix
plural: Bug Fixes
- name: Deprecate
header: Deprecated Feature
plural: Deprecated Features
- name: Documentation
header: Documentation
plural: Documentation
- name: Bug
header: Bug Fix
plural: Bug Fixes
- name: Deprecate
header: Deprecated Feature
plural: Deprecated Features
create:
include-sha-section: true
sha-section-heading: "SHA256 Hashes of the release artifacts"
sha-section-line-format: "- `{1}\t{0}`"
include-sha-section: true
sha-section-heading: "SHA256 Hashes of the release artifacts"
sha-section-line-format: "- `{1}\t{0}`"
close:
use-issue-comments: true
issue-comment: |-
Expand All @@ -33,7 +34,7 @@ close:
- [GitHub Release](https://github.com/{owner}/{repository}/releases/tag/{milestone})
- [Chocolatey.NuGet.Commands NuGet Package](https://nuget.org/packages/Chocolatey.NuGet.Commands/{milestone})
- [Chocolatey.NuGet.Common NuGet Package](https://nuget.org/packages/Chocolatey.NuGet.Common/{milestone})
- [Chocolatey.NuGet.Common NuGet Package](https://nuget.org/packages/Chocolatey.NuGet.Common/{milestone})
- [Chocolatey.NuGet.Configuration NuGet Package](https://nuget.org/packages/Chocolatey.NuGet.Configuration/{milestone})
- [Chocolatey.NuGet.Credentials NuGet Package](https://nuget.org/packages/Chocolatey.NuGet.Credentials/{milestone})
- [Chocolatey.NuGet.DependencyResolver.Core NuGet Package](https://nuget.org/packages/Chocolatey.NuGet.DependencyResolver.Core/{milestone})
Expand All @@ -46,4 +47,4 @@ close:
- [Chocolatey.NuGet.Resolver NuGet Package](https://nuget.org/packages/Chocolatey.NuGet.Resolver/{milestone})
- [Chocolatey.NuGet.Versioning NuGet Package](https://nuget.org/packages/Chocolatey.NuGet.Versioning/{milestone})
Your **[GitReleaseManager](https://github.com/GitTools/GitReleaseManager)** bot :package::rocket:
Your **[GitReleaseManager](https://github.com/GitTools/GitReleaseManager)** bot :package: :rocket:
2 changes: 1 addition & 1 deletion build/config.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!-- when changing any of the NuGetVersion props below, run tools-local\ship-public-apis -->
<MajorNuGetVersion Condition="'$(MajorNuGetVersion)' == ''">3</MajorNuGetVersion>
<MinorNuGetVersion Condition="'$(MinorNuGetVersion)' == ''">4</MinorNuGetVersion>
<PatchNuGetVersion Condition="'$(PatchNuGetVersion)' == ''">2</PatchNuGetVersion>
<PatchNuGetVersion Condition="'$(PatchNuGetVersion)' == ''">3</PatchNuGetVersion>
<SemanticVersion Condition=" '$(SemanticVersion)' == '' ">$(MajorNuGetVersion).$(MinorNuGetVersion).$(PatchNuGetVersion)</SemanticVersion>

<!-- ** Change for each new preview/rc -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class V2FeedQueryBuilder
private const string ExactFilterFormat = "tolower(Id)%20eq%20'{0}'";
private const string ByIdOnlyFormat = "substringof('{0}',tolower(Id))";
private const string ByTagOnlyFormat = "substringof('{0}',Tags)";
private const string IdStartsWithFormat = "startswith(tolower(Id),'chocolatey')";
private const string IdStartsWithFormat = "startswith(tolower(Id),'{0}')";

//////////////////////////////////////////////////////////
// End - Chocolatey Specific Modification
Expand Down

0 comments on commit ebe8b9b

Please sign in to comment.