Notes improvements for github and in-app changelog (#10490)

Author: coreycb

scripts/ci/render-notes.py

@@ -87,9 +87,11 @@ def render_notes(
                     tag = note["tag"].lower().capitalize()
                     if tag not in render_data["releases"][vers]["notes"]:
                         render_data["releases"][vers]["notes"][tag] = []
-                    render_data["releases"][vers]["notes"][tag].append(
-                        note["note"].strip()
-                    )
+                    note_entry = {
+                        "text": note["note"].strip(),
+                        "issues": note.get("issues", []),
+                    }
+                    render_data["releases"][vers]["notes"][tag].append(note_entry)
                     render_data["releases"][vers]["long_notes"].append(note["note"].strip())
                 if "short_note" in note:
                     tag = note["tag"].lower().capitalize()

scripts/ci/templates/changelog_long.txt

@@ -1,7 +1,7 @@
 {% for tag, long_notes in notes.items() %}
 {{ tag }}:
 {%- for note in long_notes %}
-- {{ note }}
+- {{ note.text }}{% if note.issues %} ({% for issue in note.issues %}#{{ issue }}{% if not loop.last %}, {% endif %}{% endfor %}){% endif %}
 {%- endfor %}
 
 {% endfor %}

scripts/ci/templates/changelog_master.xml

@@ -1,6 +1,8 @@
     <release version="{{ version }}" versioncode="{{ versioncode }}" date="{{ date }}">
-{%- for note in long_notes %}
-        <change>{{ note }}</change>
+{%- for tag, tag_notes in notes.items() %}
+{%- for note in tag_notes %}
+        <change>{{ tag }}: {{ note.text }}</change>
+{%- endfor %}
 {%- endfor %}
     </release>