diff --git a/action.yml b/action.yml index b3fa8700..ea65bc0b 100644 --- a/action.yml +++ b/action.yml @@ -80,18 +80,18 @@ inputs: {{ custom }} {% endif %} + {% if pulls %} + **Merged pull requests:** + {% for pull in pulls %} + - {{ pull.title }} (#{{ pull.number }}) (@{{ pull.author.username }}) + {% endfor %} + {% if issues %} **Closed issues:** {% for issue in issues %} - {{ issue.title }} (#{{ issue.number }}) {% endfor %} {% endif %} - - {% if pulls %} - **Merged pull requests:** - {% for pull in pulls %} - - {{ pull.title }} (#{{ pull.number }}) (@{{ pull.author.username }}) - {% endfor %} {% endif %} changelog_ignore: description: Labels for issues and pull requests to be ignored (comma-delimited) diff --git a/test/action/test_changelog.py b/test/action/test_changelog.py index e7cac95c..b85e01d2 100644 --- a/test/action/test_changelog.py +++ b/test/action/test_changelog.py @@ -226,11 +226,11 @@ def test_render(): Custom release notes - **Closed issues:** - - Issue title (#1) - **Merged pull requests:** - Pull title (#3) (@author) + + **Closed issues:** + - Issue title (#1) """ data = { "compare_url": "https://github.com/Me/PkgName.jl/compare/v1.2.2...v1.2.3",