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 | |
Jonas Ådahl | 379ee65 | 2015-11-18 10:45:28 +0800 | [diff] [blame] | 8 | 1. Verify that the wayland-protocols version dependency is correct, |
| 9 | and that wayland-protocols has had a release with any needed |
| 10 | protocol updates. |
| 11 | |
| 12 | 2. Update the first three lines of configure.ac to the intended |
Bryce Harrington | 044f79d | 2015-02-06 18:01:33 -0800 | [diff] [blame] | 13 | version, commit. Also note that Weston includes versioned |
| 14 | dependencies on 'wayland-server' and 'wayland-client' in |
Bryce Harrington | 842ef2f | 2015-08-16 14:16:26 -0700 | [diff] [blame] | 15 | configure.ac which occasionally need updated as well. Then commit |
Bryce Harrington | 044f79d | 2015-02-06 18:01:33 -0800 | [diff] [blame] | 16 | your changes: |
| 17 | |
Bryce Harrington | 9a4a47d | 2015-05-27 23:55:08 -0700 | [diff] [blame] | 18 | $ export RELEASE_NUMBER="x.y.z" |
Bryce Harrington | cab7ed9 | 2015-08-16 14:00:05 -0700 | [diff] [blame] | 19 | $ export RELEASE_NAME="[alpha|beta|RC1|RC2|official|point]" |
Bryce Harrington | 044f79d | 2015-02-06 18:01:33 -0800 | [diff] [blame] | 20 | $ git status |
Bryce Harrington | 4b48895 | 2015-05-26 19:20:37 -0700 | [diff] [blame] | 21 | $ git commit configure.ac -m "configure.ac: bump to version $RELEASE_NUMBER for the $RELEASE_NAME release" |
Bryce Harrington | 044f79d | 2015-02-06 18:01:33 -0800 | [diff] [blame] | 22 | $ git push |
| 23 | |
Jonas Ådahl | 379ee65 | 2015-11-18 10:45:28 +0800 | [diff] [blame] | 24 | 3. For Weston releases, install Xwayland, either from your distro or |
Bryce Harrington | 8a88cec | 2015-02-13 20:46:41 -0800 | [diff] [blame] | 25 | manually (see http://wayland.freedesktop.org/building.html). If |
| 26 | you install it to a location other than /usr/bin/Xwayland, specify |
| 27 | this in the following env var: |
Bryce Harrington | a9d0b68 | 2015-02-12 16:49:15 -0800 | [diff] [blame] | 28 | |
Bryce Harrington | 90e2d07 | 2015-09-17 16:33:48 -0700 | [diff] [blame] | 29 | XWAYLAND=$(which Xwayland) # Or specify your own path |
| 30 | export DISTCHECK_CONFIGURE_FLAGS="--with-xserver-path=$XWAYLAND" |
Bryce Harrington | a9d0b68 | 2015-02-12 16:49:15 -0800 | [diff] [blame] | 31 | |
Bryce Harrington | b33877a | 2015-05-15 18:51:19 -0700 | [diff] [blame] | 32 | If you're using a locally installed libinput or other dependency |
| 33 | libraries, you'll likely need to set a few other environment |
| 34 | variables: |
Bryce Harrington | 5fa7351 | 2015-05-15 18:50:04 -0700 | [diff] [blame] | 35 | |
Bryce Harrington | b33877a | 2015-05-15 18:51:19 -0700 | [diff] [blame] | 36 | export WLD="<path-to-your-local-installation>" |
| 37 | export LD_LIBRARY_PATH=$WLD/lib |
| 38 | export PKG_CONFIG_PATH=$WLD/lib/pkgconfig:$WLD/share/pkgconfig/ |
Bryce Harrington | 5fa7351 | 2015-05-15 18:50:04 -0700 | [diff] [blame] | 39 | |
Jonas Ådahl | 379ee65 | 2015-11-18 10:45:28 +0800 | [diff] [blame] | 40 | 4. Run the release.sh script to generate the tarballs, sign and |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 41 | upload them, and generate a release announcement template. |
| 42 | This script can be obtained from X.org's modular package: |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 43 | |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 44 | http://cgit.freedesktop.org/xorg/util/modular/tree/release.sh |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 45 | |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 46 | The script supports a --dry-run option to test it without actually |
| 47 | doing a release. If the script fails on the distcheck step due to |
| 48 | a testsuite error that can't be fixed for some reason, you can |
| 49 | skip testsuite by specifying the --dist argument. Pass --help to |
| 50 | see other supported options. |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 51 | |
Bryce Harrington | 9a4a47d | 2015-05-27 23:55:08 -0700 | [diff] [blame] | 52 | $ release.sh . |
Bryce Harrington | 4b48895 | 2015-05-26 19:20:37 -0700 | [diff] [blame] | 53 | |
Bryce Harrington | 9a4a47d | 2015-05-27 23:55:08 -0700 | [diff] [blame] | 54 | For wayland, also publish the publican documentation to |
| 55 | wayland.freedesktop.org: |
Bryce Harrington | e534ae4 | 2015-05-27 15:33:27 -0700 | [diff] [blame] | 56 | |
Bryce Harrington | 9a4a47d | 2015-05-27 23:55:08 -0700 | [diff] [blame] | 57 | $ ./publish-doc |
Bryce Harrington | e534ae4 | 2015-05-27 15:33:27 -0700 | [diff] [blame] | 58 | |
| 59 | |
Jonas Ådahl | 379ee65 | 2015-11-18 10:45:28 +0800 | [diff] [blame] | 60 | 5. Compose the release announcements. The script will generate |
Bryce Harrington | 1875aff | 2015-01-26 18:23:37 -0800 | [diff] [blame] | 61 | *.x.y.0.announce files with a list of changes and tags, one for |
| 62 | wayland, one for weston. Prepend these with a human-readable |
| 63 | listing of the most notable changes. For x.y.0 releases, indicate |
| 64 | the schedule for the x.y+1.0 release. |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 65 | |
Jonas Ådahl | 379ee65 | 2015-11-18 10:45:28 +0800 | [diff] [blame] | 66 | 6. pgp sign the the release announcements and send them to |
Bryce Harrington | 1875aff | 2015-01-26 18:23:37 -0800 | [diff] [blame] | 67 | wayland-devel@lists.freedesktop.org |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 68 | |
Jonas Ådahl | 379ee65 | 2015-11-18 10:45:28 +0800 | [diff] [blame] | 69 | 7. Get your freshly posted release email URL from |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 70 | http://lists.freedesktop.org/archives/wayland-devel/ |
| 71 | |
Jonas Ådahl | 379ee65 | 2015-11-18 10:45:28 +0800 | [diff] [blame] | 72 | 8. Update releases.html in wayland-web with links to tarballs and |
Bryce Harrington | 7154c18 | 2015-01-30 19:10:12 -0800 | [diff] [blame] | 73 | the release email URL. |
| 74 | |
Bryce Harrington | 9a4a47d | 2015-05-27 23:55:08 -0700 | [diff] [blame] | 75 | The register_release script in wayland-web will generate an HTML |
| 76 | snippet that can be pasted into releases.html (or e.g. in emacs |
Bryce Harrington | 713acd6 | 2015-09-22 13:40:43 -0700 | [diff] [blame] | 77 | insert it via "C-u M-! scripts/register_release x.y.z RC2") and |
Bryce Harrington | 9a4a47d | 2015-05-27 23:55:08 -0700 | [diff] [blame] | 78 | customized. |
Bryce Harrington | f89ca8c | 2015-05-27 13:03:42 -0700 | [diff] [blame] | 79 | |
Bryce Harrington | 9a4a47d | 2015-05-27 23:55:08 -0700 | [diff] [blame] | 80 | Once satisfied: |
Bryce Harrington | f89ca8c | 2015-05-27 13:03:42 -0700 | [diff] [blame] | 81 | |
Bryce Harrington | e534ae4 | 2015-05-27 15:33:27 -0700 | [diff] [blame] | 82 | $ git commit ./releases.html -m "Add ${RELEASE_NUMBER} release" |
Bryce Harrington | 7154c18 | 2015-01-30 19:10:12 -0800 | [diff] [blame] | 83 | $ git push |
Bryce Harrington | e534ae4 | 2015-05-27 15:33:27 -0700 | [diff] [blame] | 84 | $ ./deploy |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 85 | |
Jonas Ådahl | 379ee65 | 2015-11-18 10:45:28 +0800 | [diff] [blame] | 86 | 9. Update topic in #wayland to point to the release announcement URL |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 87 | |
Bryce Harrington | bbdb2a9 | 2015-05-27 13:06:59 -0700 | [diff] [blame] | 88 | For x.y.0 releases, also create the release series x.y branch. The x.y |
| 89 | branch is for bug fixes and conservative changes to the x.y.0 release, |
| 90 | and is where we release x.y.z releases from. Creating the x.y branch |
| 91 | opens up master for new development and lets new development move on. |
| 92 | We've done this both after the x.y.0 release (to focus development on |
| 93 | bug fixing for the x.y.1 release for a little longer) or before the |
| 94 | x.y.0 release (like we did with the 1.5.0 release, to unblock master |
| 95 | development early). |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 96 | |
Bryce Harrington | b73c58e | 2015-01-09 18:09:21 -0800 | [diff] [blame] | 97 | $ git branch x.y |
| 98 | $ git push origin x.y |
| 99 | |
Kristian Høgsberg | 73dfbd5 | 2014-05-23 10:13:59 -0700 | [diff] [blame] | 100 | The master branch configure.ac version should always be (at least) |
| 101 | x.y.90, with x.y being the most recent stable branch. Stable branch |
| 102 | configure version is just whatever was most recently released from |
| 103 | that branch. |
| 104 | |
| 105 | For stable branches, we commit fixes to master first, then cherry-pick |
| 106 | them back to the stable branch. |