blob: 4f4174b084332865584a87f5006e06c8549ebb8d [file] [log] [blame]
Bryce Harringtonb73c58e2015-01-09 18:09:21 -08001To make a release of Weston and/or Wayland, follow these steps.
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -07002
Bryce Harringtonb73c58e2015-01-09 18:09:21 -08003 0. Update the first three lines of configure.ac to the intended
4 version, commit. Also note that Weston includes versioned
5 dependencies on 'wayland-server' and 'wayland-client' in
6 configure.ac which typically need updated as well.
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -07007
Bryce Harringtonb73c58e2015-01-09 18:09:21 -08008 1. Verify the test suites and codebase checks pass. (All of the
9 tests pass should pass except for xwayland, which can be flaky.)
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070010
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080011 $ make check
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070012
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080013 2. Run the release.sh script to generate the tarballs, sign and
14 upload them, and generate a release announcement template.
15 This script can be obtained from X.org's modular package:
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070016
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080017 http://cgit.freedesktop.org/xorg/util/modular/tree/release.sh
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070018
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080019 The script supports a --dry-run option to test it without actually
20 doing a release. If the script fails on the distcheck step due to
21 a testsuite error that can't be fixed for some reason, you can
22 skip testsuite by specifying the --dist argument. Pass --help to
23 see other supported options.
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070024
Bryce Harrington1875aff2015-01-26 18:23:37 -080025 3. Compose the release announcements. The script will generate
26 *.x.y.0.announce files with a list of changes and tags, one for
27 wayland, one for weston. Prepend these with a human-readable
28 listing of the most notable changes. For x.y.0 releases, indicate
29 the schedule for the x.y+1.0 release.
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070030
Bryce Harrington1875aff2015-01-26 18:23:37 -080031 4. Send the release announcements to
32 wayland-devel@lists.freedesktop.org
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080033
34 5. Get your freshly posted release email URL from
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070035 http://lists.freedesktop.org/archives/wayland-devel/
36
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080037 6. Update releases.html in wayland-web with links to tarballs and
38 the release email URL
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070039
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080040 7. Update topic in #wayland to point to the release announcement URL
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070041
42For x.y.0 releases, also create the x.y branch. The x.y branch is for
Bryce Harringtonae715792015-01-09 18:09:20 -080043bug fixes and conservative changes to the x.y.0 release, and is where
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070044we release x.y.z releases from. Creating the x.y branch opens up
45master for new development and lets new development move on. We've
46done this both after the x.y.0 release (to focus development on bug
47fixing for the x.y.1 release for a little longer) or before the x.y.0
48release (like we did with the 1.5.0 release, to unblock master
49development early).
50
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080051 $ git branch x.y
52 $ git push origin x.y
53
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070054The master branch configure.ac version should always be (at least)
55x.y.90, with x.y being the most recent stable branch. Stable branch
56configure version is just whatever was most recently released from
57that branch.
58
59For stable branches, we commit fixes to master first, then cherry-pick
60them back to the stable branch.