4
This document describes the processes for making and announcing a Bazaar
5
release, and managing the release process. This is just one phase of the
6
`overall development cycle
7
<http://doc.bazaar.canonical.com/developers/cycle.html>`_, (go re-read this
8
document to ensure it hasn't been updated since you last read it) but it's
11
If you're doing your first release you can follow this document and read
12
each step explanation. It's also a good practice to read it for any release
13
to ensure you don't miss a step and to update it as the release process
16
If you're helping the Release Manager (RM) for one reason or another, you
17
may notice that he didn't follow that document scrupulously. He may have
18
good reasons to do that but he may also have missed some parts.
26
#. PQM access rights (or you won't be able to land any change)
28
#. Download the pqm plugin and install it into your ``~/.bazaar/plugins``::
30
bzr branch lp:bzr-pqm ~/.bazaar/plugins/pqm
32
#. Alternatively, you can download and install ``lp:hydrazine`` (the main
33
difference is that hydrazine requires the branch to land to be hosted on
39
In this document, we're talking about source releases only, packages and
40
installers are built from this but we won't talk about them here.
42
Every release is part of a series, ``bzr-2.4.1`` is part of series ``2.4``.
44
We do two different kind of releases: the betas releases and the stable
45
releases for a given series.
47
For a given series, releases will be done to deliver new versions of bzr to
48
different kinds of users:
50
#. beta releases: named ``x.ybn`` where ``x.y`` is the series and ``n``
51
starts at 1 and is incremented. These releases are targeted to beta
52
testers who don't want to run from source but are interested in features
55
#. stable releases: name ``x.y.z`` where ``x.y.`` is the series and ``z``
56
starts at 1 and is incremented. These releases are targeted at people
57
that want bugfixes only and no new features.
60
Differences in the release process between beta and stable release will be
61
mentioned when needed.
66
As of July 2011, we maintain four series (and one that is about to be EOLed).
67
Concurrently releasing them all at the same time makes it harder to shorten
68
the delay between the source availability and the package building longer
69
than necessary (we delay the official announcement until most of our users
70
can install the new release).
72
In order to continue to do time-based releases, we need to plan the
73
releases by series to minimize the collisions. In the end, it's the Release
74
Manager call to decide whether he prefers to do all releases at once
75
though, so the rules presented here are a conservative approach.
77
We want to respect the following rules:
79
#. as much as possible releases should not disturb development, and
80
ongoing development should not disturb releases,
82
#. the most recent development series should release once a month during
83
the beta period (see `Development cycles <cycle.html>`_ for more
86
#. the most recent stable series should release every other month (based
87
on the amount of bug fixes, this can be shorter or longer depending on
90
#. previous series should release on a regular basis without interfering
91
with the most recent series with a decreasing order of priority (again
92
this should be based on bugs importance and user feedback),
94
#. the death of a series should be planned ahead of time. 6 months should
95
give enough time to our users to migrate to a more recent series. This
96
doesn't mean we will make a release at the end of the series, just that
97
before the end date we *could* possibly put out another release if
98
there was a sufficiently important fix. Beyond that date, we won't
99
even land changes on that branch (unless something causes a miraculous
102
#. there should not be more than 2 releases in the same week (but the
103
Release Manager is free to ignore this (get in touch with packagers
106
#. the series are aligned with Ubuntu releases for convenience since we
107
create a new series every 6 months. This means that we support the
108
stable series for 18 months. Note that we also propose the most recent
109
stable series via the stable PPA but that the SRU processs allow us to
110
reach a wider audience.
112
At the start of a series cycle
113
==============================
115
To start a new series cycle:
117
#. Create a new series ``x.y`` at <https://launchpad.net/bzr/+addseries>.
119
#. Add milestones at <https://launchpad.net/bzr/x.y/+addmilestone> to that
120
series for the beta releases and the stable series mentioning their
121
expected dates. Only the milestone associated to the next release in
122
this series should be left active to avoid clutter when targeting bugs.
124
#. If you made a new series, you will need to create a new pqm-controlled
125
branch for this release series. This branch will be used only from the
126
first non-beta release onwards. It needs to be created by a Canonical
127
sysadmin (ask the core devs for instructions or to do it for you).
129
#. Start a new release-notes file::
131
cd doc/en/release-notes
132
cp series-template.txt bzr-x.y.txt # e.g. bzr-2.3.txt
135
#. Start a new whats-new file::
138
cp template.txt bzr-x.y.txt # e.g. bzr-2.6.txt
142
At the start of a release cycle
143
===============================
145
To start a new release cycle:
147
#. Send mail to the list with the key dates, who will be the release
148
manager, and the main themes or targeted bugs. Ask people to nominate
149
objectives, or point out any high-risk things that are best done early,
150
or that interact with other changes. This is called the metronome mail
151
and is described in `Development cycles <cycle.html>`_.
153
#. Make a local branch to prepare the release::
155
bzr branch lp:bzr/x.y x.y-dev
157
If you're doing your first beta release, branch from trunk::
159
bzr branch lp:bzr x.y-dev
161
Note that you will generally reuse the same branch for all releases in a
164
#. Configure pqm-submit for this branch, with a section like this (where
165
``x.y`` is the series for your release). **Or use hydrazine for easier
166
setup** ``~/.bazaar/locations.conf``::
168
[/home/mbp/bzr/x.y-dev]
169
pqm_email = Canonical PQM <pqm@bazaar-vcs.org>
170
submit_branch = http://bazaar.launchpad.net/~bzr-pqm/bzr/x.y
171
parent_branch = http://bazaar.launchpad.net/~bzr-pqm/bzr/x.y
172
public_branch = http://bazaar.example.com/x.y-dev
173
submit_to = bazaar@lists.canonical.com
174
smtp_server = mail.example.com:25
176
Please see <http://doc.bazaar.canonical.com/developers/HACKING.html#an-overview-of-pqm>
177
for more details on PQM
179
#. Update the version number in the ``bzr`` script, and the
180
``bzrlib/__init__.py`` file::
182
version_info = (x, y, z, 'dev', 0)
184
#. Add a new section at the top of the current release notes (in
185
``doc/en/release-notes``) about the new release, including its version
186
number and the headings from ``release-template.txt``.
188
#. Update the "What's New" documents in ``doc/en/whats-new``.
190
#. Make sure a milestone exists for your release and that it is active,
191
<https://launchpad.net/bzr/x.y> lists the existing milestones,
192
<https://launchpad.net/bzr/x.y/x.y.z/+edit> allows you to toggle the
195
#. Commit this and send it to PQM.
198
Doing a particular release
199
==========================
201
Update the source code
202
----------------------
204
#. Check that there is a milestone for the release you're doing. If there
205
is no milestone it indicates a process problem - make the milestone but
206
also mail the list to raise this issue in our process. Milestones are
207
found at <https://launchpad.net/bzr/+milestone/x.y.z>.
209
#. In the release branch, update ``version_info`` in ``./bzrlib/__init__.py``.
210
Make sure the corresponding milestone exists.
211
Double check that ./bzr ``_script_version`` matches ``version_info``. Check
212
the output of ``./bzr --version``.
214
For beta releases use::
216
version_info = (2, 1, 0, 'beta', SERIAL)
220
version_info = (2, 1, 0, 'beta', 1)
222
For stable releases use::
224
version_info = (2, 1, 2, 'final', 0)
226
#. Update the ``./doc/en/release-notes/`` section for this release.
228
Fill out the date and a description of the release under the existing
229
header. If there isn't one, follow the instructions above for using the
230
``release-template.txt`` file.
232
See *2.1.1* or similar for an example of what this looks like.
234
#. Add or check the summary of the release into the "What's New" document.
236
#. To check that all bugs mentioned in the release notes are actually
237
marked as closed in Launchpad, you can run
238
``tools/check-newsbugs.py``::
240
./tools/check-newsbugs.py doc/en/release-notes/bzr-x.y.txt
242
As of 2011-07-18, all bugs mentioned in the output of the script requires
243
some sort of intervention (either changing the status if it's not 'Fix
244
Released' or setting a different milestone if the bug hasn't been
245
fixed). A few false positives may remain in the older series, don't let
246
this slow you down too much. This script accepts options you may find
247
useful, use ``./tools/check-newsbugs.py`` to display its usage.
249
#. Commit these changes to the release branch, using a command like::
251
bzr commit -m "Release 2.3.1"
253
The diff before you commit will be something like::
255
=== modified file 'bzrlib/__init__.py'
256
--- bzrlib/__init__.py 2011-02-09 06:35:00 +0000
257
+++ bzrlib/__init__.py 2011-03-10 10:24:47 +0000
259
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
260
# releaselevel of 'dev' for unreleased under-development code.
262
-version_info = (2, 3, 1, 'dev', 0)
263
+version_info = (2, 3, 1, 'final', 0)
265
# API compatibility version
266
api_minimum_version = (2, 3, 0)
268
=== modified file 'doc/en/release-notes/bzr-2.3.txt'
269
--- doc/en/release-notes/bzr-2.3.txt 2011-03-09 08:30:16 +0000
270
+++ doc/en/release-notes/bzr-2.3.txt 2011-03-10 10:40:47 +0000
275
-:2.3.1: NOT RELEASED YET
277
-External Compatibility Breaks
278
-*****************************
280
-.. These may require users to change the way they use Bazaar.
285
-.. New commands, options, etc that users may wish to try out.
290
-.. Improvements to existing commands, especially improved performance
291
- or memory usage, or better results.
294
+This is a bugfix release. Upgrading is recommended for all users of earlier
300
=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
301
--- doc/en/whats-new/whats-new-in-2.3.txt 2011-02-03 16:29:18 +0000
302
+++ doc/en/whats-new/whats-new-in-2.3.txt 2011-03-10 11:10:36 +0000
304
improvements made to the core product, it highlights enhancements within the
305
broader Bazaar world of potential interest to those upgrading.
307
-Bazaar 2.3.0 is fully compatible both locally and on the network with 2.0 2.1,
308
-and 2.2, and can read and write repositories generated by all previous
309
+Bazaar 2.3.1 includes all the fixes in the un-released 2.0.7, 2.1.4 and 2.2.5
310
+versions that weren't included in 2.3.0 and fixes some bugs on its own.
312
+See the :doc:`../release-notes/index` for details.
314
+Bazaar 2.3 is fully compatible both locally and on the network with 2.0, 2.1,
315
+and 2.2. It can read and write repositories generated by all previous
321
#. Tag the new release::
325
#. Push those changes to a bzr branch that is public and accessible on the
326
Internet. PQM will pull from this branch when it attempts to merge your
327
changes. Then submit those changes to PQM for merge into the appropriate
331
bzr pqm-submit -m "(vila) Release 2.3.1 (Vincent Ladeuil)"
335
bzr lp-propose -m "Release 1.14" --approve lp:bzr/1.14
338
#. When PQM succeeds, pull down the master release branch.
341
Making the source tarball
342
-------------------------
344
#. Change into the source directory and run ::
348
#. Now we'll try expanding this tarball and running the test suite
349
to check for packaging problems::
351
make check-dist-tarball | subunit2pyunit
353
You may encounter failures while running the test suite caused by your
354
locally installed plugins. Use your own judgment to decide if you can
355
release with these failures. When in doubt, disable the faulty plugins
356
one by one until you get no more failures. Alternatively, you can use
357
``BZR_DISABLE_PLUGINS`` or ``BZR_PLUGIN_PATH=-site`` to disable one or
360
Remember that PQM has just tested everything too, this step is
361
particularly testing that the pyrex extensions, which are updated
362
by your local pyrex version when you run make dist, are in good
366
Publishing the source tarball
367
-----------------------------
369
#. Go to the relevant <https://launchpad.net/bzr/x.y> series page in Launchpad.
371
#. Create a release of the milestone, and upload the source tarball and
372
the GPG signature. Or, if you prefer, use the
373
``tools/packaging/lp-upload-release`` script to do this. Note that
374
this changes what the download widget on the Launchpad bzr home
375
page shows, so don't stop the release process yet, or platform binary
376
installers won't be made and the download list will stay very small!
377
<https://bugs.launchpad.net/launchpad/+bug/586445>
380
Kick off the next cycle
381
-----------------------
383
From that point, there is no possible return, the tarball has been uploaded
384
so you can relax a bit.
386
You're still holding a "social" lock on the launchpad branch though. Until
387
your start the next cycle, nobody should land anything on this branch. If
388
they do, they either targeted the wrong branch or didn't update the news
389
file correctly, so the sooner the branch is opened again, the better.
391
This matters more for ``lp:bzr`` than for ``lp:bzr/x.y``, ``lp:bzr`` should
392
always be open for landing, so you should do `At the start of a release
393
cycle`_ as soon as possible (i.e. update the version number in ``bzr`` and
394
``bzrlib/__init__``, create/update the news files and create/update the
395
milestone for the next relase).
397
You may also need to do `At the start of a series cycle`_ if you're starting
400
A word of caution: the instructions above works well for all releases but
401
there is one special case that requires a bit more care: when you release
402
the *last* beta for a given ``x.y`` series (from trunk aka lp:bzr), you need
403
to setup *two* branches for the next cycle:
405
#. ``lp:bzr`` needs to be opened for the next *series* ``x.(y+1)``
407
#. ``lp:bzr/x.y`` needs to be opened for the next *release* ``x.y.0`` in the
408
series. Since this is first real use of ``lp:bzr/x.y``, this is also the
409
deadline for the PQM branch to be created.
411
Both are important as ``lp:bzr`` should remain open so any change can be
412
landed, ``lp:bzr/x.y`` on the other hand should be ready to receive bug
415
``lp:bzr`` is generally more important as the bug fixes on ``lp:bzr/x.y``
416
won't be released sooner than a month from now whereas people may already
417
been waiting to land on ``lp:bzr``.
421
#. Create or update the ``x.y`` PQM branch based on whatever
422
revision you want to release
424
#. Open ``lp:bzr`` for ``x.(y+1)``
426
#. Release ``x.y.0`` from ``lp:bzr/x.y``
428
#. Open ``lp:bzr/x.y`` for bug fixes
430
Announcing the source freeze
431
----------------------------
433
#. Post to the ``bazaar`` list, saying that the source has been frozen
434
(gone gold). Be extra clear that this is only a *source* release
435
targeted at packagers and installer builders (see
436
<https://bugs.launchpad.net/launchpad/+bug/645084>). This is the cue
437
for platform maintainers and plugin authors to update their code. This
438
is done before the general public announcement of the release.
440
#. Pause for a few days.
443
Publishing the release
444
----------------------
446
There is normally a delay of a few days after the source freeze to allow
447
for binaries to be built on various platforms. Once they have been built,
448
we have a releasable product. The next step is to make it generally
449
available to the world.
451
#. Go to the release web page at <https://launchpad.net/bzr/x.y/x.y.z>
453
#. Announce on the `Bazaar website <http://bazaar.canonical.com/>`_.
454
This page is edited via the lp:bzr-website branch. (Changes
455
pushed to this branch are refreshed by a cron job on escudero.)
457
#. Check that the documentation for this release is available in
458
<http://doc.bazaar.canonical.com>. It should be automatically build when the
459
branch is created, by a cron script ``update-bzr-docs`` on
463
Announcing the release
464
----------------------
466
Now that the release is publicly available, tell people about it.
468
#. Make an announcement mail.
470
For beta releases, this is sent to the ``bazaar@lists.canonical.com``
471
list only to inform plugin authors and people responsible for building
472
packages or installers.
474
Once the installers are available, the mail can be sent to the
475
``bazaar-announce`` list too.
477
For stable releases, it should also be cc'd to ``info-gnu@gnu.org``,
478
``python-announce-list@python.org``, ``bug-directory@gnu.org``.
480
In all cases, it is good to set ``Reply-To: bazaar@lists.canonical.com``,
481
so that people who reply to the announcement don't spam other lists.
483
The announce mail will look something like this::
485
Subject: bzr x.y.z released!
487
The Bazaar team is happy to announce availability of a new
488
release of the bzr adaptive version control system.
489
Bazaar is part of the GNU system <http://gnu.org/>.
491
<<Summary paragraph from news>>
493
Thanks to everyone who contributed patches, suggestions, and
496
Bazaar is now available for download from
497
https://launchpad.net/bzr/x.y/x.y.z/ as a source tarball; packages
498
for various systems will be available soon.
500
<<release notes from this release back to the last major release>>
502
Feel free to tweak this to your taste.
504
#. Make an announcement through <https://launchpad.net/bzr/+announce>
506
#. Announce on http://freshmeat.net/projects/bzr/
508
This should be done for beta releases and stable releases. If you do not
509
have a Freshmeat account yet, ask one of the existing admins.
511
The purpose here is to point users to the latest stable release while still
512
publishing announcements for beta releases.
514
There are several kinds of modifications that could be done there via the
515
``Administration`` box in the lower right area of the page:
517
* Edit the project: This is where most of the URLs proposed in the
518
``Links`` box are edited. This should rarely change except for the URLs
519
related to the latest stable release.
521
* New announcement: When doing a release, put the summary of the release
522
(you can't embed URLs there, the moderation staff remove them). Users
523
can still access the releases notes via the ``Release Notes`` URL in
524
the ``Links`` box in the upper right area of the page. When doing the
525
first stable release in a series, delete the ``Unstable installers``
526
<https://launchpad.net/bzr/x.y/x.ybn> and ``Unstable source tarball``
527
<http://launchpad.net/bzr/x.y/x.ybn/+download/bzr-x.ybn.tar.gz>
528
links. Conversely, when creating the first beta in a development
529
series, create these links again. Check all links when doing other
532
* Set direct download: When releasing a new stable release, this should
533
point to the corresponding launchpad page:
534
<https://launchpad.net/bzr/x.y/x.y.z/>
536
#. Update `<http://en.wikipedia.org/wiki/Bazaar_(software)>`_ -- this should
537
be done for the stable and beta releases.
539
#. Update the python package index: <http://pypi.python.org/pypi/bzr> - best
542
python setup.py register
544
Remember to check the results afterward -- this should be done for
545
stable releases but not for beta releases.
547
To be able to register the release you must create an account on
548
<http://pypi.python.org/pypi> and have one of the existing owners of
549
the project add you to the group.
552
Merging the released code back to trunk
553
---------------------------------------
555
Merge the release branch back into the trunk. The ``doc/en/release-notes``
556
changes should be merged into the right place because each release series
557
has its own release-notes file, but double-check.
559
If it's not already done, advance the version number in ``bzr`` and
560
``bzrlib/__init__.py``. Submit this back into pqm for bzr.dev.
562
As soon as you change the version number in trunk, make sure you have
563
created the corresponding milestone to ensure the continuity in bug
564
targeting or nominating. Depending on the change, you may even have to
565
create a new series (if your change the major or minor release number), in
566
that case go to `At the start of a series cycle`_ and follow the
567
instructions from there.
570
Releases until the final one
571
----------------------------
573
Congratulations - you have made your first release. Have a beer or fruit
574
juice - it's on the house! If it was a beta, you're not finished
575
yet. Another beta or hopefully a stable release is still to come.
577
The process is the same as for the first release. Goto `Doing a particular
578
release`_ and follow the instructions again. Some details change between
579
beta and stable releases, but they should be documented. If the instructions
580
aren't clear enough, please fix them.
583
Getting the release into Ubuntu
584
-------------------------------
586
(Feel free to propose or add new sections here about what we should do to
587
get bzr into other places.)
589
For the currently-under-development release of Ubuntu, no special action
590
is needed: the release should be picked by Debian and synced from there into
593
Releases off stable bzr branches should go in to the ``-updates`` of the
594
Ubuntu release that originally contained that branch. (Ubuntu Lucid had
595
bzr 2.2.0, so should get every 2.2.x update.) This means going through
596
the `SRU (Stable Release Updates)
597
<https://wiki.ubuntu.com/StableReleaseUpdates>`__ process.
599
Since September 2010, bzr has received approval by the technical
600
board for the `MicroReleaseExceptions
601
<https://wiki.ubuntu.com/StableReleaseUpdates/MicroReleaseExceptions>`__
602
category so that whole bugfix releases can more easily be
605
Progress on these realeases is tracked on the `SRU wiki
606
<http://wiki.bazaar.canonical.com/UbuntuStableReleaseUpdates>`_
609
**After making a bzr stable-release release, nominate the most serious bug
610
for the appropriate Ubuntu release and subscribe the `ubuntu-sru` team.**
612
This requires a couple of tricks (please reconsider and tweak as things
613
evolves from one release to the other):
615
* create a distro task with the ``Also affects distribution`` button and
616
select ``bzr (Ubuntu)``.
618
* change the *URL* to point to ``ubuntu/+source/bzr`` instead of ``bzr``
619
(this is needed if you create the distro task but not if it exists
620
already). You should now be able to click the ``Nominate for release``
621
button and select the right Ubuntu release. As of September 2010, this
624
* ``oneiric`` for the 2.4 series,
625
* ``natty`` for the 2.3 series,
626
* ``maverick`` for the 2.2 series,
627
* ``lucid`` for the 2.1 series,
629
* Subscribe the ``~ubuntu-sru`` team to the bug.
631
* Add a comment targeted to ``~ubuntu-sru`` explaining the expectations
632
(we are targeting running the test suite during the build which, as of
633
September 2010, fails for known reasons that are currently addressed).
634
Search for bugs tagged with ``sru`` for examples and don't forget to tag
635
the bug you selected.
641
* `Packaging into the bzr PPA <ppa.html>`_ to make and publish Ubuntu
643
* `Bazaar Developer Document Catalog <index.html>`_
644
* `Development cycles <cycle.html>`_: things that happen during the cycle
645
before the actual release.
648
vim: filetype=rst textwidth=74 ai shiftwidth=4