blob: 30b6c7c2acd336480b89c82ec5b090aced5c8a6a [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 Harrington044f79d2015-02-06 18:01:33 -08003 0. Verify the test suites and codebase checks pass. All of the
4 tests pass should either pass or skip.
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -07005
Bryce Harringtonb73c58e2015-01-09 18:09:21 -08006 $ make check
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -07007
Bryce Harrington044f79d2015-02-06 18:01:33 -08008 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 Harrington8a88cec2015-02-13 20:46:41 -080018 2. For Weston releases, install Xwayland, either from your distro or
19 manually (see http://wayland.freedesktop.org/building.html). If
20 you install it to a location other than /usr/bin/Xwayland, specify
21 this in the following env var:
Bryce Harringtona9d0b682015-02-12 16:49:15 -080022
23 export DISTCHECK_CONFIGURE_FLAGS="--with-xserver-path=<your-Xwayland-path>"
24
Bryce Harrington5fa73512015-05-15 18:50:04 -070025 If you're using a locally installed libinput or other dependency
26 libraries, you'll likely need to set a few other environment
27 variables:
28
29 export WLD="<path-to-your-local-installation>"
30 export LD_LIBRARY_PATH=$WLD/lib
31 export PKG_CONFIG_PATH=$WLD/lib/pkgconfig:$WLD/share/pkgconfig/
32
Bryce Harringtona9d0b682015-02-12 16:49:15 -080033 3. Run the release.sh script to generate the tarballs, sign and
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080034 upload them, and generate a release announcement template.
35 This script can be obtained from X.org's modular package:
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070036
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080037 http://cgit.freedesktop.org/xorg/util/modular/tree/release.sh
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070038
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080039 The script supports a --dry-run option to test it without actually
40 doing a release. If the script fails on the distcheck step due to
41 a testsuite error that can't be fixed for some reason, you can
42 skip testsuite by specifying the --dist argument. Pass --help to
43 see other supported options.
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070044
Bryce Harringtona9d0b682015-02-12 16:49:15 -080045 4. Compose the release announcements. The script will generate
Bryce Harrington1875aff2015-01-26 18:23:37 -080046 *.x.y.0.announce files with a list of changes and tags, one for
47 wayland, one for weston. Prepend these with a human-readable
48 listing of the most notable changes. For x.y.0 releases, indicate
49 the schedule for the x.y+1.0 release.
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070050
Bryce Harringtona9d0b682015-02-12 16:49:15 -080051 5. Send the release announcements to
Bryce Harrington1875aff2015-01-26 18:23:37 -080052 wayland-devel@lists.freedesktop.org
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080053
Bryce Harringtona9d0b682015-02-12 16:49:15 -080054 6. Get your freshly posted release email URL from
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070055 http://lists.freedesktop.org/archives/wayland-devel/
56
Bryce Harringtona9d0b682015-02-12 16:49:15 -080057 7. Update releases.html in wayland-web with links to tarballs and
Bryce Harrington7154c182015-01-30 19:10:12 -080058 the release email URL.
59
60 $ git commit releases.html -m "Add x.y.z release"
61 $ git push
62 $ rsync -avz * wayland.freedesktop.org:/srv/wayland.freedesktop.org/www/
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070063
Bryce Harringtona9d0b682015-02-12 16:49:15 -080064 8. Update topic in #wayland to point to the release announcement URL
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070065
Bryce Harrington7154c182015-01-30 19:10:12 -080066
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070067For x.y.0 releases, also create the x.y branch. The x.y branch is for
Bryce Harringtonae715792015-01-09 18:09:20 -080068bug fixes and conservative changes to the x.y.0 release, and is where
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070069we release x.y.z releases from. Creating the x.y branch opens up
70master for new development and lets new development move on. We've
71done this both after the x.y.0 release (to focus development on bug
72fixing for the x.y.1 release for a little longer) or before the x.y.0
73release (like we did with the 1.5.0 release, to unblock master
74development early).
75
Bryce Harringtonb73c58e2015-01-09 18:09:21 -080076 $ git branch x.y
77 $ git push origin x.y
78
Kristian Høgsberg73dfbd52014-05-23 10:13:59 -070079The master branch configure.ac version should always be (at least)
80x.y.90, with x.y being the most recent stable branch. Stable branch
81configure version is just whatever was most recently released from
82that branch.
83
84For stable branches, we commit fixes to master first, then cherry-pick
85them back to the stable branch.