add addition label to release label workflow (#3263)

* add addition label to release label workflow

* address review comments

Author: derrickaw

.github/release.yml

@@ -1,17 +1,23 @@
+# Note: If updating these categories, also update 
+# .github/workflows/release-notes-labels.yml and 
+# contributor-docs/code-contributions.md.
 changelog:
   exclude:
     labels:
       - ignore-for-release
   categories:
-    - title: New Templates
+    - title: Additional New Features
       labels:
-        - new-template
+        - addition
+    - title: Bug fixes
+      labels:
+        - bug-fix
     - title: Improvements
       labels:
         - improvement
-    - title: Bug fixes
+    - title: New Templates
       labels:
-        - bug-fix
+        - new-template
     - title: Package Upgrades
       labels:
         - package-upgrade

.github/workflows/release-notes-labels.yml

@@ -13,10 +13,13 @@ jobs:
         with:
           mode: minimum
           count: 1
+          # Note: If updating these labels, also update .github/release.yml 
+          # and contributor-docs/code-contributions.md.
           labels: |
+            addition
+            bug-fix
             ignore-for-release
-            new-template
             improvement
-            bug-fix
+            new-template
             package-upgrade
-          message: "This PR is being prevented from merging because you have not added any of the following labels: [ignore-for-release, new-template, improvement, bug-fix, package-upgrade]. You'll need to add one before this PR can be merged so that these can be used for release notes. For more information, see https://github.com/GoogleCloudPlatform/DataflowTemplates/blob/main/contributor-docs/code-contributions.md#release-notes"
+          message: "This PR is being prevented from merging because you have not added any of the following labels: [addition, bug-fix, ignore-for-release, improvement, new-template, package-upgrade]. You'll need to add one before this PR can be merged so that these can be used for release notes. For more information, see https://github.com/GoogleCloudPlatform/DataflowTemplates/blob/main/contributor-docs/code-contributions.md#release-notes"

contributor-docs/code-contributions.md

@@ -488,8 +488,11 @@ Release notes are [automatically generated](https://docs.github.com/en/repositor
 based on the PR labels defined in [release.yml](https://github.com/GoogleCloudPlatform/DataflowTemplates/blob/main/.github/release.yml).
 Before submitting your PR, a repo maintainer must add one of the following labels in order for all checks to pass:
 
+- `addition`: Addition of new functionality
+- `bug-fix`: Fixes for bugs or issues in existing code
 - `ignore-for-release`: Changes that should not appear in release notes (e.g., documentation updates, internal refactoring)
-- `new-template`: Addition of new Dataflow templates
 - `improvement`: Enhancements to existing functionality or performance improvements
-- `bug-fix`: Fixes for bugs or issues in existing code
+- `new-template`: Addition of new Dataflow templates
 - `package-upgrade`: Updates to dependencies, libraries, or package versions
+
+Note: If updating these labels, also update .github/release.yml and .github/workflows/release-notes-labels.yml.