Add a docker type to the towncrier configuration (#5673)

... and certain other changelog-related fixes
This commit is contained in:
Richard van der Hoff 2019-07-12 17:27:07 +01:00 committed by GitHub
parent 5f158ec039
commit d336b51331
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 13 deletions

View file

@ -30,11 +30,10 @@ use github's pull request workflow to review the contribution, and either ask
you to make any refinements needed or merge it and make them ourselves. The you to make any refinements needed or merge it and make them ourselves. The
changes will then land on master when we next do a release. changes will then land on master when we next do a release.
We use `CircleCI <https://circleci.com/gh/matrix-org>`_ and `Buildkite We use `Buildkite <https://buildkite.com/matrix-dot-org/synapse>`_ for
<https://buildkite.com/matrix-dot-org/synapse>`_ for continuous integration. continuous integration. Buildkite builds need to be authorised by a
Buildkite builds need to be authorised by a maintainer. If your change breaks maintainer. If your change breaks the build, this will be shown in GitHub, so
the build, this will be shown in GitHub, so please keep an eye on the pull please keep an eye on the pull request for feedback.
request for feedback.
To run unit tests in a local development environment, you can use: To run unit tests in a local development environment, you can use:
@ -70,13 +69,21 @@ All changes, even minor ones, need a corresponding changelog / newsfragment
entry. These are managed by Towncrier entry. These are managed by Towncrier
(https://github.com/hawkowl/towncrier). (https://github.com/hawkowl/towncrier).
To create a changelog entry, make a new file in the ``changelog.d`` To create a changelog entry, make a new file in the ``changelog.d`` file named
file named in the format of ``PRnumber.type``. The type can be in the format of ``PRnumber.type``. The type can be one of the following:
one of ``feature``, ``bugfix``, ``removal`` (also used for
deprecations), or ``misc`` (for internal-only changes).
The content of the file is your changelog entry, which can contain Markdown * ``feature``.
formatting. The entry should end with a full stop ('.') for consistency. * ``bugfix``.
* ``docker`` (for updates to the Docker image).
* ``doc`` (for updates to the documentation).
* ``removal`` (also used for deprecations).
* ``misc`` (for internal-only changes).
The content of the file is your changelog entry, which should be a short
description of your change in the same style as the rest of our `changelog
<https://github.com/matrix-org/synapse/blob/master/CHANGES.md>`_. The file can
contain Markdown formatting, and should end with a full stop ('.') for
consistency.
Adding credits to the changelog is encouraged, we value your Adding credits to the changelog is encouraged, we value your
contributions and would like to have you shouted out in the release notes! contributions and would like to have you shouted out in the release notes!

1
changelog.d/5619.docker Normal file
View file

@ -0,0 +1 @@
Base Docker image on a newer Alpine Linux version (3.8 -> 3.10).

View file

@ -1 +0,0 @@
Base Docker image on a newer Alpine Linux version (3.8 -> 3.10)

View file

@ -1 +1 @@
Add missing space in default logging file format generated by the Docker image Add missing space in default logging file format generated by the Docker image.

1
changelog.d/5673.misc Normal file
View file

@ -0,0 +1 @@
Add a `docker` type to the towncrier configuration.

View file

@ -14,6 +14,11 @@
name = "Bugfixes" name = "Bugfixes"
showcontent = true showcontent = true
[[tool.towncrier.type]]
directory = "docker"
name = "Updates to the Docker image"
showcontent = true
[[tool.towncrier.type]] [[tool.towncrier.type]]
directory = "doc" directory = "doc"
name = "Improved Documentation" name = "Improved Documentation"