From db3a6b490a0f0dd5943821d685028787c646c567 Mon Sep 17 00:00:00 2001 From: manuroe Date: Wed, 11 Aug 2021 11:45:01 +0200 Subject: [PATCH 1/2] Make Towncrier compatible with the release script --- changelog.d/_template.md.jinja | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/changelog.d/_template.md.jinja b/changelog.d/_template.md.jinja index 2a7b9d6fed..a0b2dd9eea 100644 --- a/changelog.d/_template.md.jinja +++ b/changelog.d/_template.md.jinja @@ -25,13 +25,19 @@ {%- set gh_issue = value.replace("#", "") -%} {{- links.append( "[#%s](%s/issues/%s)" | format(gh_issue, gh_element, gh_issue) ) | default("", True) -}} {%- elif value.startswith("pr-") %} - {%- set pr = value.replace("pr-", "#") -%} - {{- links.append(pr) | default("", True) -}} + {%- set pr = value.replace("pr-", "") -%} + {{- links.append( "[#%s](%s/pull/%s)" | format(pr, gh_element, pr) ) | default("", True) -}} + {%- elif value.startswith("x-nolink-") %} + {{- nil | default("", True) -}} {% else %} {{- links.append(value) | default("", True) -}} {% endif -%} {% endfor -%} +{% if links|length == 0 %} +- {{ text }} +{% else %} - {{ text }} ({{ links | join(', ') }}) +{% endif %} {% endfor %} {% else %} - {{ sections[section][category]['']|join(', ') }} From 34144604140102e88827b8f9f425fb1e8d15511d Mon Sep 17 00:00:00 2001 From: manuroe Date: Wed, 11 Aug 2021 11:47:39 +0200 Subject: [PATCH 2/2] changelog --- changelog.d/pr-4689.build | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/pr-4689.build diff --git a/changelog.d/pr-4689.build b/changelog.d/pr-4689.build new file mode 100644 index 0000000000..d24a7e1910 --- /dev/null +++ b/changelog.d/pr-4689.build @@ -0,0 +1 @@ +CHANGES.md: Use towncrier to manage the change log. More info in [CONTRIBUTING](CONTRIBUTING.md#changelog). \ No newline at end of file