Skip to content

Commit

Permalink
Merge pull request #712 from cevich/0.8.7
Browse files Browse the repository at this point in the history
Dockertest Version 0.8.7 (NO API Changes)
  • Loading branch information
cevich authored Apr 27, 2017
2 parents b5008f7 + 07baf44 commit 4516367
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 3 deletions.
2 changes: 1 addition & 1 deletion conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#: are also reflected in documentation.
#:
#: The short X.Y version. This MUST be inside single ("'") quotes for parsing!!
version = '0.8.6'
version = '0.8.7'

#: If extensions (or modules to document with autodoc) are in another directory,
#: add these directories to sys.path here. If the directory is relative to the
Expand Down
2 changes: 1 addition & 1 deletion config_defaults/defaults.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# all settings and sections defined here (config_defaults/)

##### API Version number applying to all bundled tests
config_version = 0.8.6
config_version = 0.8.7

#: Autotest version dependency for framework (or override for individual tests)
autotest_version = @!NOVERSIONCHECK!@
Expand Down
2 changes: 1 addition & 1 deletion dockertest/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#: API Revision number, as an integer (range 0-255). Not significant!
#: for version comparisons. e.g. ``0.0.1 == 0.0.2 != 0.2.2``
REVIS = 6
REVIS = 7

#: String format representation for MAJOR, MINOR, and REVIS
FMTSTRING = "%d.%d.%d"
Expand Down
72 changes: 72 additions & 0 deletions index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,78 @@ Documentation Module
:members:
:no-undoc-members:


----------------
Hacking
----------------


Rolling a new minor version
===========================

When the time is right, a large number of PRs have been merged, and you're in
the right mood, it's time for a new minor release. Assuming the last tagged
version was ``0.8.6``, here are the steps required:

#. Make sure your master branch exactly matches upstream:

``git remote update``
``git checkout master``
``git reset --hard upstream/master``

#. Create a new branch off master with the next number:

``git checkout -tb 0.8.7``

#. Bump the version number up in three places:

``$EDITOR config_defaults/defaults.ini dockertest/version.py conf.py``

#. Create a release commit:

``git commit -asm "Dockertest Version 0.8.7 (NO API Changes)"``

#. Push to your fork, and open a PR targeting the previous milestone, ``0.8.7``
in this case.

#. After PR is merged, switch back to master, update it, and tag the version, and push.

``git remote update``
``git checkout master``
``git reset --hard upstream/master``
``git tag 0.8.7 HEAD``
``git push --tags upstream``

#. `Create a new release`_, using the just tagged version and the closed milestone
as the title. e.g. "``Dockertest Version 0.8.7 (NO API Changes)``". This will
cause github to automatically produce a zip and tarball, with URLs for historical
reference or use (i.e. somewhere ``git`` is not available).

For the release notes (big text box under the title), link to the github
comparison URL formed by the last two tags with ``...`` in-between (end of the url):

``[Changes](https://github.com/autotest/autotest-docker/compare/0.8.6...0.8.7)``

The actual github comparison page (URL above) can also be used as reference for
drafting a release-announcement e-mail, providing brownie-points and karma
for all the people who helped out.

#. Next, `close the previous milestone`_ (``0.8.7`` for this example).

#. `Create the next milestone`_ (next version PRs will be attached to),
named "``Docker Autotest Version 0.8.8 (NO API Changes)``", add a description
and due-date if desired.

#. Move any currently open PRs the new milestone (right side pane of each PRs page).


.. _`Create a new release`: https://github.com/autotest/autotest-docker/releases/new

.. _`Create the next milestone`: https://github.com/autotest/autotest-docker/milestones/new

.. _`close the previous milestone`: https://github.com/autotest/autotest-docker/milestones


----------------
Further Reading
----------------
Expand Down

0 comments on commit 4516367

Please sign in to comment.