Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 1 | To make a release of Weston and/or Wayland, follow these steps. |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 2 | |
Bryce Harrington | 044f79d | 2015-02-06 18:01:33 -0800 | [diff] [blame^] | 3 | 0. Verify the test suites and codebase checks pass. All of the |
| 4 | tests pass should either pass or skip. |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 5 | |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 6 | $ make check |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 7 | |
Bryce Harrington | 044f79d | 2015-02-06 18:01:33 -0800 | [diff] [blame^] | 8 | 1. Update the first three lines of configure.ac to the intended |
| 9 | version, commit. Also note that Weston includes versioned |
| 10 | dependencies on 'wayland-server' and 'wayland-client' in |
| 11 | configure.ac which typically need updated as well. Then commit |
| 12 | your changes: |
| 13 | |
| 14 | $ git status |
| 15 | $ git commit configure.ac -m "configure.ac: bump to version x.y.z for the xxx release" |
| 16 | $ git push |
| 17 | |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 18 | 2. Run the release.sh script to generate the tarballs, sign and |
| 19 | upload them, and generate a release announcement template. |
| 20 | This script can be obtained from X.org's modular package: |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 21 | |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 22 | http://cgit.freedesktop.org/xorg/util/modular/tree/release.sh |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 23 | |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 24 | The script supports a --dry-run option to test it without actually |
| 25 | doing a release. If the script fails on the distcheck step due to |
| 26 | a testsuite error that can't be fixed for some reason, you can |
| 27 | skip testsuite by specifying the --dist argument. Pass --help to |
| 28 | see other supported options. |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 29 | |
Bryce Harrington | 1875aff | 2015-01-26 18:23:37 -0800 | [diff] [blame] | 30 | 3. Compose the release announcements. The script will generate |
| 31 | *.x.y.0.announce files with a list of changes and tags, one for |
| 32 | wayland, one for weston. Prepend these with a human-readable |
| 33 | listing of the most notable changes. For x.y.0 releases, indicate |
| 34 | the schedule for the x.y+1.0 release. |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 35 | |
Bryce Harrington | 1875aff | 2015-01-26 18:23:37 -0800 | [diff] [blame] | 36 | 4. Send the release announcements to |
| 37 | wayland-devel@lists.freedesktop.org |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 38 | |
| 39 | 5. Get your freshly posted release email URL from |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 40 | http://lists.freedesktop.org/archives/wayland-devel/ |
| 41 | |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 42 | 6. Update releases.html in wayland-web with links to tarballs and |
Bryce Harrington | 7154c18 | 2015-01-30 19:10:12 -0800 | [diff] [blame] | 43 | the release email URL. |
| 44 | |
| 45 | $ git commit releases.html -m "Add x.y.z release" |
| 46 | $ git push |
| 47 | $ rsync -avz * wayland.freedesktop.org:/srv/wayland.freedesktop.org/www/ |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 48 | |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 49 | 7. Update topic in #wayland to point to the release announcement URL |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 50 | |
Bryce Harrington | 7154c18 | 2015-01-30 19:10:12 -0800 | [diff] [blame] | 51 | |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 52 | For x.y.0 releases, also create the x.y branch. The x.y branch is for |
Bryce Harrington | ae71579 | 2015-01-09 18:09:20 -0800 | [diff] [blame] | 53 | bug fixes and conservative changes to the x.y.0 release, and is where |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 54 | we release x.y.z releases from. Creating the x.y branch opens up |
| 55 | master for new development and lets new development move on. We've |
| 56 | done this both after the x.y.0 release (to focus development on bug |
| 57 | fixing for the x.y.1 release for a little longer) or before the x.y.0 |
| 58 | release (like we did with the 1.5.0 release, to unblock master |
| 59 | development early). |
| 60 | |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 61 | $ git branch x.y |
| 62 | $ git push origin x.y |
| 63 | |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 64 | The master branch configure.ac version should always be (at least) |
| 65 | x.y.90, with x.y being the most recent stable branch. Stable branch |
| 66 | configure version is just whatever was most recently released from |
| 67 | that branch. |
| 68 | |
| 69 | For stable branches, we commit fixes to master first, then cherry-pick |
| 70 | them back to the stable branch. |