Merge branch 'main' into ci-migrate-to-rennovate

Author: gmuloc

.github/actions/rn-pr-labeler-action/action.yml

@@ -9,6 +9,7 @@
 https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
 """
 
+from itertools import permutations
 from pathlib import Path
 from typing import Any
 
@@ -21,6 +22,9 @@
     "rust",
 ]
 
+MULTI_SCOPES = ["|".join(scope_permutation) for scope_count in range(2, len(SCOPES) + 1) for scope_permutation in permutations(SCOPES, scope_count)]
+ALL_SCOPES = [*SCOPES, *MULTI_SCOPES]
+
 # CI and Test are excluded from Release Notes
 CATEGORIES = {
     "Feat": "Features",
@@ -53,15 +57,15 @@ def increase_indent(self, flow: bool = False, *_args: Any, **_kwargs: Any) -> No
     categories_list: list[dict[str, str | list[str]]] = []
 
     # First add exclude labels
-    for scope in SCOPES:
+    for scope in ALL_SCOPES:
         exclude_list.append(f"rn: Test({scope})")
         exclude_list.append(f"rn: CI({scope})")
     exclude_list.extend(["rn: Test", "rn: CI"])
 
     # Then add the categories
 
     breaking_label_categories = ["Feat", "Fix", "Cut", "Revert", "Refactor", "Bump"]
-    breaking_labels = [f"rn: {cc_type}({scope})!" for cc_type in breaking_label_categories for scope in SCOPES]
+    breaking_labels = [f"rn: {cc_type}({scope})!" for cc_type in breaking_label_categories for scope in ALL_SCOPES]
     breaking_labels.extend(f"rn: {cc_type}!" for cc_type in breaking_label_categories)
 
     categories_list.append(
@@ -80,6 +84,14 @@ def increase_indent(self, flow: bool = False, *_args: Any, **_kwargs: Any) -> No
         for scope in SCOPES
     )
 
+    # Add fixes spanning multiple scopes
+    categories_list.append(
+        {
+            "title": "Fixed issues in multiple scopes",
+            "labels": [f"rn: Fix({scope})" for scope in MULTI_SCOPES],
+        },
+    )
+
     # Add other fixes
     categories_list.append(
         {
@@ -92,11 +104,19 @@ def increase_indent(self, flow: bool = False, *_args: Any, **_kwargs: Any) -> No
     categories_list.extend(
         {
             "title": f"New features and enhancements in {scope}",
-            "labels": [f"rn: Fix({scope})"],
+            "labels": [f"rn: Feat({scope})"],
         }
         for scope in SCOPES
     )
 
+    # Add features spanning multiple scopes
+    categories_list.append(
+        {
+            "title": "New features and enhancements in multiple scopes",
+            "labels": [f"rn: Feat({scope})" for scope in MULTI_SCOPES],
+        },
+    )
+
     # Add other features
     categories_list.append(
         {
@@ -105,7 +125,7 @@ def increase_indent(self, flow: bool = False, *_args: Any, **_kwargs: Any) -> No
         },
     )
 
-    doc_labels = [f"rn: Doc({scope})" for scope in SCOPES]
+    doc_labels = [f"rn: Doc({scope})" for scope in ALL_SCOPES]
     doc_labels.append("rn: Doc")
 
     categories_list.append(

.github/generate_release.py

@@ -8,7 +8,7 @@ Fixes #<ISSUE ID>
 
 ## Component(s) name
 
-<!-- Indicate one of `rust`, `pyavd-utils`, `requirements` -->
+<!-- Indicate one or more of `validation`, `passwords`, `rust`, `requirements` -->
 
 ## Proposed changes
 <!--- Describe your changes in detail -->