Skip to content

Commit

Permalink
Merge branch 'develop' into 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
abompard committed Jun 23, 2022
2 parents fe6e0dc + 558c907 commit 36c32de
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ Documentation
=============

You can read Bodhi's
`release notes <https://fedora-infra.github.io/bodhi/latest/user/release_notes.html>`_
`release notes <https://fedora-infra.github.io/bodhi/6.0/user/release_notes.html>`_
and documentation `online <https://fedora-infra.github.io/bodhi>`_.

If you are interested in contributing to Bodhi, you can read the
`developer documentation`_.

.. _developer documentation: https://fedora-infra.github.io/bodhi/latest/developer/index.html
.. _developer documentation: https://fedora-infra.github.io/bodhi/6.0/developer/index.html


IRC
Expand Down
2 changes: 1 addition & 1 deletion bodhi-client/bodhi-client.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Created by pyp2rpm-3.3.7
%global pypi_name bodhi-client
%global pypi_version 6.0.0
%global pypi_version 6.0.1

Name: %{pypi_name}
Version: %{pypi_version}
Expand Down
2 changes: 1 addition & 1 deletion bodhi-messages/bodhi-messages.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Created by pyp2rpm-3.3.7
%global pypi_name bodhi-messages
%global pypi_version 6.0.0
%global pypi_version 6.0.1

Name: %{pypi_name}
Version: %{pypi_version}
Expand Down
2 changes: 1 addition & 1 deletion bodhi-server/bodhi-server.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global pypi_name bodhi-server
%global pypi_version 6.0.0
%global pypi_version 6.0.1

Name: %{pypi_name}
Version: %{pypi_version}
Expand Down
3 changes: 2 additions & 1 deletion docs/developer/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ Preparation
If you are making a new major or new minor release:

#. Prepare the ``.mergify.yml`` file for the new ``major.minor`` branch as described above.
#. Raise the version to the appropriate value in ``bodhi-*/pyproject.toml``.
#. Raise the version to the appropriate value in ``bodhi-*/pyproject.toml`` and in the spec files
in ``bodhi-*/*.spec``.
#. Add missing authors to the release notes fragments by changing to the ``news`` directory and
running the ``get-authors.py`` script, but check for duplicates and errors
#. Generate the release notes by running ``towncrier build --version VERSION``. Be aware that any
Expand Down

0 comments on commit 36c32de

Please sign in to comment.