blob: 22ede8dc9e23dfdc9613378a8804b21ef71b7e46 [file] [log] [blame]
Emil Velikov2edc29a2016-11-16 18:25:41 +00001<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2<html lang="en">
3<head>
4 <meta http-equiv="content-type" content="text/html; charset=utf-8">
Emil Velikov028d29b2016-11-28 17:22:15 +00005 <title>Releasing process</title>
Emil Velikov2edc29a2016-11-16 18:25:41 +00006 <link rel="stylesheet" type="text/css" href="mesa.css">
7</head>
8<body>
9
10<div class="header">
11 <h1>The Mesa 3D Graphics Library</h1>
12</div>
13
14<iframe src="contents.html"></iframe>
15<div class="content">
16
Andres Gomeze0f7d252017-03-27 21:48:10 +030017
Emil Velikov2edc29a2016-11-16 18:25:41 +000018<h1>Releasing process</h1>
19
20<ul>
21<li><a href="#overview">Overview</a>
22<li><a href="#schedule">Release schedule</a>
23<li><a href="#pickntest">Cherry-pick and test</a>
24<li><a href="#branch">Making a branchpoint</a>
25<li><a href="#prerelease">Pre-release announcement</a>
26<li><a href="#release">Making a new release</a>
27<li><a href="#announce">Announce the release</a>
28<li><a href="#website">Update the mesa3d.org website</a>
29<li><a href="#bugzilla">Update Bugzilla</a>
30</ul>
31
Andres Gomeze0f7d252017-03-27 21:48:10 +030032
Emil Velikov2edc29a2016-11-16 18:25:41 +000033<h1 id="overview">Overview</h1>
34
35<p>
36This document uses the convention X.Y.Z for the release number with X.Y being
37the stable branch name.
38<br>
39Mesa provides feature and bugfix releases. Former use zero as patch version (Z),
40while the latter have a non-zero one.
41</p>
42
43<p>
44For example:
45</p>
46<pre>
47 Mesa 10.1.0 - 10.1 branch, feature
48 Mesa 10.1.4 - 10.1 branch, bugfix
49 Mesa 12.0.0 - 12.0 branch, feature
50 Mesa 12.0.2 - 12.0 branch, bugfix
51</pre>
52
Andres Gomeze0f7d252017-03-27 21:48:10 +030053
Emil Velikov2edc29a2016-11-16 18:25:41 +000054<h1 id="schedule">Release schedule</h1>
55
56<p>
57Releases should happen on Fridays. Delays can occur although those should be keep
58to a minimum.
Emil Velikove5c24ad2017-04-24 17:22:19 +010059<br>
60See our <a href="release-calendar.html" target="_parent">calendar</a> for the
61date and other details for individual releases.
Emil Velikov2edc29a2016-11-16 18:25:41 +000062</p>
63
64<h2>Feature releases</h2>
65<ul>
Eric Engestrom077879c2017-02-26 23:58:03 +000066<li>Available approximately every three months.
Emil Velikov2edc29a2016-11-16 18:25:41 +000067<li>Initial timeplan available 2-4 weeks before the planned branchpoint (rc1)
68on the mesa-announce@ mailing list.
69<li>A <a href="#prerelease">pre-release</a> announcement should be available
Eric Engestrom077879c2017-02-26 23:58:03 +000070approximately 24 hours before the final (non-rc) release.
Emil Velikov2edc29a2016-11-16 18:25:41 +000071</ul>
72
73<h2>Stable releases</h2>
74<ul>
75<li>Normally available once every two weeks.
76<li>Only the latest branch has releases. See note below.
77<li>A <a href="#prerelease">pre-release</a> announcement should be available
Eric Engestrom077879c2017-02-26 23:58:03 +000078approximately 48 hours before the actual release.
Emil Velikov2edc29a2016-11-16 18:25:41 +000079</ul>
80
81<p>
82Note: There is one or two releases overlap when changing branches. For example:
83<br>
84The final release from the 12.0 series Mesa 12.0.5 will be out around the same
85time (or shortly after) 13.0.1 is out.
86</p>
87
Andres Gomeze0f7d252017-03-27 21:48:10 +030088
Emil Velikov2edc29a2016-11-16 18:25:41 +000089<h1 id="pickntest">Cherry-picking and testing</h1>
90
91<p>
92Commits nominated for the active branch are picked as based on the
93<a href="submittingpatches.html#criteria" target="_parent">criteria</a> as
94described in the same section.
Andres Gomeze0f7d252017-03-27 21:48:10 +030095</p>
Emil Velikov2edc29a2016-11-16 18:25:41 +000096
97<p>
Andres Gomez80587072017-03-27 21:48:11 +030098Nomination happens in the mesa-stable@ mailing list. However,
99maintainer is resposible of checking for forgotten candidates in the
100master branch. This is achieved by a combination of ad-hoc scripts and
101a casual search for terms such as regression, fix, broken and similar.
102</p>
103
104<p>
105Maintainer is also responsible for testing in various possible permutations of
Emil Velikov2edc29a2016-11-16 18:25:41 +0000106the autoconf and scons build.
107</p>
108
109<h2>Cherry-picking and build/check testing</h2>
110
111<p>Done continuously up-to the <a href="#prerelease">pre-release</a> announcement.</p>
112
113<p>
114As an exception, patches can be applied up-to the last ~1h before the actual
115release. This is made <strong>only</strong> with explicit permission/request,
116and the patch <strong>must</strong> be very well contained. Thus it cannot
117affect more than one driver/subsystem.
118</p>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300119
Emil Velikov2edc29a2016-11-16 18:25:41 +0000120<p>
121Currently Ilia Mirkin and AMD devs have requested "permanent" exception.
122</p>
123
Emil Velikov2edc29a2016-11-16 18:25:41 +0000124<ul>
125<li>make distcheck, scons and scons check must pass
126<li>Testing with different version of system components - LLVM and others is also
127performed where possible.
Andres Gomez8a3e33a2017-03-27 21:48:12 +0300128<li>As a general rule, testing with various combinations of configure
129switches, depending on the specific patchset.
Emil Velikov2edc29a2016-11-16 18:25:41 +0000130</ul>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300131
Emil Velikov2edc29a2016-11-16 18:25:41 +0000132<p>
Andres Gomez8a3e33a2017-03-27 21:48:12 +0300133Achieved by combination of local ad-hoc scripts, mingw-w64 cross
134compilation and AppVeyor plus Travis-CI, the latter as part of their
135Github integration.
Emil Velikov2edc29a2016-11-16 18:25:41 +0000136</p>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300137
Emil Velikovccb89e72017-03-15 17:34:26 +0000138<p>
Andres Gomez029d7be2017-05-03 21:14:38 +0300139For Windows related changes, the main contact point is Brian
140Paul. Jose Fonseca can also help as a fallback contact.
141</p>
142
143<p>
Emil Velikovccb89e72017-03-15 17:34:26 +0000144<strong>Note:</strong> If a patch in the current queue needs any additional
145fix(es), then they should be squashed together.
146<br>
147The commit messages and the <code>cherry picked from</code> tags must be preserved.
148</p>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300149
Emil Velikovccb89e72017-03-15 17:34:26 +0000150<p>
151This should be noted in the <a href="#prerelease">pre-announce</a> email.
Andres Gomeze0f7d252017-03-27 21:48:10 +0300152</p>
153
Emil Velikovccb89e72017-03-15 17:34:26 +0000154<pre>
155 git show b10859ec41d09c57663a258f43fe57c12332698e
156
157 commit b10859ec41d09c57663a258f43fe57c12332698e
Andres Gomeze0f7d252017-03-27 21:48:10 +0300158 Author: Jonas Pfeil &lt;pfeiljonas@gmx.de&gt;
Emil Velikovccb89e72017-03-15 17:34:26 +0000159 Date: Wed Mar 1 18:11:10 2017 +0100
160
161 ralloc: Make sure ralloc() allocations match malloc()'s alignment.
162
163 The header of ralloc needs to be aligned, because the compiler assumes
164 ...
165
166 (cherry picked from commit cd2b55e536dc806f9358f71db438dd9c246cdb14)
167
168 Squashed with commit:
169
170 ralloc: don't leave out the alignment factor
171
172 Experimentation shows that without alignment factor gcc and clang choose
173 ...
174
175 (cherry picked from commit ff494fe999510ea40e3ed5827e7818550b6de126)
176</pre>
Emil Velikov2edc29a2016-11-16 18:25:41 +0000177
178<h2>Regression/functionality testing</h2>
179
180<p>
181Less often (once or twice), shortly before the pre-release announcement.
182Ensure that testing is redone if Intel devs have requested an exception, as per above.
183</p>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300184
Emil Velikov2edc29a2016-11-16 18:25:41 +0000185<ul>
186<li><em>no regressions should be observed for Piglit/dEQP/CTS/Vulkan on Intel platforms</em>
187<li><em>no regressions should be observed for Piglit using the swrast, softpipe
188and llvmpipe drivers</em>
189</ul>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300190
Emil Velikov2edc29a2016-11-16 18:25:41 +0000191<p>
192Currently testing is performed courtesy of the Intel OTC team and their Jenkins CI setup. Check with the Intel team over IRC how to get things setup.
193</p>
194
Andres Gomezfcdc96d2017-03-27 21:48:13 +0300195<p>
196Installing the built driver from the pre-announced RC branch in the
197system and making some every day's use until the release may be a good
198idea too.
199</p>
200
Emil Velikov2edc29a2016-11-16 18:25:41 +0000201
202<h1 id="branch">Making a branchpoint</h1>
203
204<p>
205A branchpoint is made such that new development can continue in parallel to
206stabilisation and bugfixing.
207</p>
208
209<p>
210Note: Before doing a branch ensure that basic build and <code>make check</code>
211testing is done and there are little to-no issues.
212<br>
213Ideally all of those should be tackled already.
214</p>
215
216<p>
217Check if the version number is going to remain as, alternatively
218<code> git mv docs/relnotes/{current,new}.html </code> as appropriate.
219</p>
220
221<p>
222To setup the branchpoint:
223</p>
224<pre>
225 git checkout master # make sure we're in master first
226 git tag -s X.Y-branchpoint -m "Mesa X.Y branchpoint"
227 git checkout -b X.Y
Emil Velikov0f8afde2017-01-19 15:35:38 +0000228 git checkout master
229 $EDITOR VERSION # bump the version number
230 git commit -as
Emil Velikov1d104f92017-01-26 19:26:13 +0000231 cp docs/relnotes/{X.Y,X.Y+1}.html # copy/create relnotes template
232 git commit -as
Emil Velikov2edc29a2016-11-16 18:25:41 +0000233 git push origin X.Y-branchpoint X.Y
234</pre>
235
236<p>
237Now go to
238<a href="https://bugs.freedesktop.org/editversions.cgi?action=add&amp;product=Mesa" target="_parent">Bugzilla</a> and add the new Mesa version X.Y.
239</p>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300240
Emil Velikov2edc29a2016-11-16 18:25:41 +0000241<p>
Emil Velikov383e8e22017-02-20 19:27:49 +0000242Check that there are no distribution breaking changes and revert them if needed.
243For example: files being overwritten on install, etc. Happens extremely rarely -
244we had only one case so far (see commit 2ced8eb136528914e1bf4e000dea06a9d53c7e04).
Emil Velikov2edc29a2016-11-16 18:25:41 +0000245</p>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300246
Emil Velikov2edc29a2016-11-16 18:25:41 +0000247<p>
248Proceed to <a href="#release">release</a> -rc1.
249</p>
250
Andres Gomeze0f7d252017-03-27 21:48:10 +0300251
Emil Velikov2edc29a2016-11-16 18:25:41 +0000252<h1 id="prerelease">Pre-release announcement</h1>
253
254<p>
255It comes shortly after outstanding patches in the respective branch are pushed.
256Developers can check, in brief, what's the status of their patches. They,
257alongside very early testers, are strongly encouraged to test the branch and
258report any regressions.
259<br>
260It is followed by a brief period (normally 24 or 48 hours) before the actual
261release is made.
262</p>
263
264<h2>Terminology used</h2>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300265
Emil Velikov2edc29a2016-11-16 18:25:41 +0000266<ul><li>Nominated</ul>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300267
Emil Velikov2edc29a2016-11-16 18:25:41 +0000268<p>
269Patch that is nominated but yet to to merged in the patch queue/branch.
270</p>
271
272<ul><li>Queued</ul>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300273
Emil Velikov2edc29a2016-11-16 18:25:41 +0000274<p>
275Patch is in the queue/branch and will feature in the next release.
276Barring reported regressions or objections from developers.
277</p>
278
279<ul><li>Rejected</ul>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300280
Emil Velikov2edc29a2016-11-16 18:25:41 +0000281<p>
282Patch does not fit the
283<a href="submittingpatches.html#criteria" target="_parent">criteria</a> and
284is followed by a brief information.
285<br>
286The release maintainer is human so if you believe you've spotted a mistake do
287let them know.
288</p>
289
290<h2>Format/template</h2>
291<pre>
292Subject: [ANNOUNCE] Mesa X.Y.Z release candidate
293To: mesa-announce@...
294Cc: mesa-dev@...
295
296Hello list,
297
298The candidate for the Mesa X.Y.Z is now available. Currently we have:
299 - NUMBER queued
300 - NUMBER nominated (outstanding)
301 - and NUMBER rejected patches
302
303BRIEF SUMMARY OF CHANGES
304
305Take a look at section "Mesa stable queue" for more information.
306
307
308Testing reports/general approval
309--------------------------------
310Any testing reports (or general approval of the state of the branch) will be
311greatly appreciated.
312
313The plan is to have X.Y.Z this DAY (DATE), around or shortly after TIME.
314
315If you have any questions or suggestions - be that about the current patch
316queue or otherwise, please go ahead.
317
318
319Trivial merge conflicts
320-----------------------
321List of commits where manual intervention was required.
322Keep the authors in the CC list.
323
324commit SHA
325Author: AUTHOR
326
327 COMMIT SUMMARY
328
329 CHERRY PICKED FROM
330
331
332For example:
333
334commit 990f395e007c3204639daa34efc3049f350ee819
335Author: Emil Velikov &lt;emil.velikov@collabora.com&gt;
336
337 anv: automake: cleanup the generated json file during make clean
338
339 (cherry picked from commit 8df581520a823564be0ab5af7dbb7d501b1c9670)
340
341
342Cheers,
343Emil
344
345
346Mesa stable queue
347-----------------
348
349Nominated (NUMBER)
350==================
351
352AUTHOR (NUMBER):
353 SHA COMMIT SUMMARY
354
355For example:
356
357Dave Airlie (1):
358 2de85eb radv: fix texturesamples to handle single sample case
359
360
361Queued (NUMBER)
362===============
363
364AUTHOR (NUMBER):
365 COMMIT SUMMARY
366
Emil Velikovccb89e72017-03-15 17:34:26 +0000367For example:
368
369Jonas Pfeil (1):
370 ralloc: Make sure ralloc() allocations match malloc()'s alignment.
371Squashed with
372 ralloc: don't leave out the alignment factor
Emil Velikov2edc29a2016-11-16 18:25:41 +0000373
374Rejected (NUMBER)
375=================
376
377Rejected (11)
378=============
379
380AUTHOR (NUMBER):
381 SHA COMMIT SUMMARY
382
383Reason: ...
384</pre>
385
Andres Gomeze0f7d252017-03-27 21:48:10 +0300386
Emil Velikov2edc29a2016-11-16 18:25:41 +0000387<h1 id="release">Making a new release</h1>
388
Emil Velikov2edc29a2016-11-16 18:25:41 +0000389<p>
390These are the instructions for making a new Mesa release.
391</p>
392
393<h3>Get latest source files</h3>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300394
Emil Velikov2edc29a2016-11-16 18:25:41 +0000395<p>
396Ensure the latest code is available - both in your local master and the
397relevant branch.
398</p>
399
400<h3>Perform basic testing</h3>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300401
Emil Velikov2edc29a2016-11-16 18:25:41 +0000402<p>
403Most of the testing should already be done during the
404<a href="#pickntest">cherry-pick</a> and
405<a href="#prerelease">pre-announce</a> stages.
Emil Velikov2edc29a2016-11-16 18:25:41 +0000406So we do a quick 'touch test'
Andres Gomeze0f7d252017-03-27 21:48:10 +0300407</p>
408
Emil Velikov2edc29a2016-11-16 18:25:41 +0000409<ul>
410<li>make distcheck (you can omit this if you're not using --dist below)
411<li>scons (from release tarball)
412<li>the produced binaries work
413</ul>
414
415<p>
416Here is one solution that I've been using.
417</p>
418
419<pre>
420 git clean -fXd; git clean -nxd
421 read # quick cross check any outstanding files
Emil Velikovf9959ca2016-11-28 17:18:06 +0000422 export __version=`cat VERSION`
Emil Velikov2edc29a2016-11-16 18:25:41 +0000423 export __mesa_root=../
424 export __build_root=./foo
425 chmod 755 -fR $__build_root; rm -rf $__build_root
426 mkdir -p $__build_root &amp;&amp; cd $__build_root
427
Emil Velikov7e79e892017-03-17 18:17:14 +0000428 $__mesa_root/autogen.sh &amp;&amp; make -j2 distcheck
Emil Velikov2edc29a2016-11-16 18:25:41 +0000429
Emil Velikovf9b18d52017-02-01 08:42:14 +0000430 # Build check the tarballs (scons, linux)
431 tar -xaf mesa-$__version.tar.xz &amp;&amp; cd mesa-$__version
432 scons
433 cd .. &amp;&amp; rm -rf mesa-$__version
434
435 # Build check the tarballs (scons, windows/mingw)
436 tar -xaf mesa-$__version.tar.xz &amp;&amp; cd mesa-$__version
437 scons platform=windows toolchain=crossmingw
438 cd .. &amp;&amp; rm -rf mesa-$__version
Emil Velikov2edc29a2016-11-16 18:25:41 +0000439
440 # Test the automake binaries
Emil Velikovf9959ca2016-11-28 17:18:06 +0000441 tar -xaf mesa-$__version.tar.xz &amp;&amp; cd mesa-$__version
Emil Velikov2edc29a2016-11-16 18:25:41 +0000442 ./configure \
443 --with-dri-drivers=i965,swrast \
444 --with-gallium-drivers=swrast \
Emil Velikovf9959ca2016-11-28 17:18:06 +0000445 --with-vulkan-drivers=intel \
Emil Velikov2edc29a2016-11-16 18:25:41 +0000446 --enable-llvm-shared-libs \
Emil Velikovb3b41562017-02-07 15:53:14 +0000447 --enable-llvm \
Emil Velikovf9959ca2016-11-28 17:18:06 +0000448 --enable-glx-tls \
449 --enable-gbm \
450 --enable-egl \
451 --with-egl-platforms=x11,drm,wayland
Emil Velikov2edc29a2016-11-16 18:25:41 +0000452 make -j2 &amp;&amp; DESTDIR=`pwd`/test make -j6 install
Emil Velikov652e3672017-02-01 09:31:56 +0000453 __glxinfo_cmd='glxinfo 2>&amp;1 | egrep -o "Mesa.*|Gallium.*|.*dri\.so"'
454 __glxgears_cmd='glxgears 2>&amp;1 | grep -v "configuration file"'
455 __es2info_cmd='es2_info 2>&amp;1 | egrep "GL_VERSION|GL_RENDERER|.*dri\.so"'
456 __es2gears_cmd='es2gears_x11 2>&amp;1 | grep -v "configuration file"'
Emil Velikov2edc29a2016-11-16 18:25:41 +0000457 export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/
458 export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/
Emil Velikovf9959ca2016-11-28 17:18:06 +0000459 export LIBGL_DEBUG=verbose
Emil Velikov652e3672017-02-01 09:31:56 +0000460 eval $__glxinfo_cmd
461 eval $__glxgears_cmd
462 eval $__es2info_cmd
463 eval $__es2gears_cmd
Emil Velikov2edc29a2016-11-16 18:25:41 +0000464 export LIBGL_ALWAYS_SOFTWARE=1
Emil Velikov652e3672017-02-01 09:31:56 +0000465 eval $__glxinfo_cmd
466 eval $__glxgears_cmd
467 eval $__es2info_cmd
468 eval $__es2gears_cmd
Emil Velikov2edc29a2016-11-16 18:25:41 +0000469 export LIBGL_ALWAYS_SOFTWARE=1
470 export GALLIUM_DRIVER=softpipe
Emil Velikov652e3672017-02-01 09:31:56 +0000471 eval $__glxinfo_cmd
472 eval $__glxgears_cmd
473 eval $__es2info_cmd
474 eval $__es2gears_cmd
Emil Velikovf9959ca2016-11-28 17:18:06 +0000475 # Smoke test DOTA2
476 unset LD_LIBRARY_PATH
477 unset LIBGL_DRIVERS_PATH
478 unset LIBGL_DEBUG
479 unset LIBGL_ALWAYS_SOFTWARE
480 export VK_ICD_FILENAMES=`pwd`/src/intel/vulkan/dev_icd.json
481 steam steam://rungameid/570 -vconsole -vulkan
Emil Velikov2edc29a2016-11-16 18:25:41 +0000482</pre>
483
484<h3>Update version in file VERSION</h3>
485
486<p>
487Increment the version contained in the file VERSION at Mesa's top-level, then
488commit this change.
489</p>
490
491<h3>Create release notes for the new release</h3>
492
493<p>
494Create a new file docs/relnotes/X.Y.Z.html, (follow the style of the previous
495release notes). Note that the sha256sums section of the release notes should
496be empty (TBD) at this point.
497</p>
498
499<p>
500Two scripts are available to help generate portions of the release notes:
Andres Gomeze0f7d252017-03-27 21:48:10 +0300501</p>
Emil Velikov2edc29a2016-11-16 18:25:41 +0000502
503<pre>
504 ./bin/bugzilla_mesa.sh
505 ./bin/shortlog_mesa.sh
506</pre>
507
508<p>
509The first script identifies commits that reference bugzilla bugs and obtains
510the descriptions of those bugs from bugzilla. The second script generates a
511log of all commits. In both cases, HTML-formatted lists are printed to stdout
512to be included in the release notes.
513</p>
514
515<p>
516Commit these changes and push the branch.
517</p>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300518
Emil Velikov2edc29a2016-11-16 18:25:41 +0000519<pre>
520 git push origin HEAD
521</pre>
522
523
Emil Velikov0f988ad2017-03-15 17:34:25 +0000524<h3>Use the release.sh script from xorg <a href="https://cgit.freedesktop.org/xorg/util/modular/">util-modular</a></h3>
Emil Velikov2edc29a2016-11-16 18:25:41 +0000525
526<p>
Emil Velikov79562032017-03-15 17:34:24 +0000527Start the release process.
Emil Velikov2edc29a2016-11-16 18:25:41 +0000528</p>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300529
Emil Velikov2edc29a2016-11-16 18:25:41 +0000530<pre>
531 ../relative/path/to/release.sh . # append --dist if you've already done distcheck above
532</pre>
533
534<p>
535Pay close attention to the prompts as you might be required to enter your GPG
536and SSH passphrase(s) to sign and upload the files, respectively.
537</p>
538
539<h3>Add the sha256sums to the release notes</h3>
540
541<p>
Eric Engestrom077879c2017-02-26 23:58:03 +0000542Edit docs/relnotes/X.Y.Z.html to add the sha256sums as available in the mesa-X.Y.Z.announce template. Commit this change.
Emil Velikov2edc29a2016-11-16 18:25:41 +0000543</p>
544
545<h3>Back on mesa master, add the new release notes into the tree</h3>
546
547<p>
548Something like the following steps will do the trick:
549</p>
550
551<pre>
552 git cherry-pick -x X.Y~1
553 git cherry-pick -x X.Y
554</pre>
555
556<p>
557Also, edit docs/relnotes.html to add a link to the new release notes, and edit
558docs/index.html to add a news entry. Then commit and push:
559</p>
560
561<pre>
562 git commit -as -m "docs: add news item and link release notes for X.Y.Z"
563 git push origin master X.Y
564</pre>
565
566
567<h1 id="announce">Announce the release</h1>
Andres Gomeze0f7d252017-03-27 21:48:10 +0300568
Emil Velikov2edc29a2016-11-16 18:25:41 +0000569<p>
570Use the generated template during the releasing process.
571</p>
572
573
574<h1 id="website">Update the mesa3d.org website</h1>
575
576<p>
Emil Velikove280a6b2017-02-10 12:51:22 +0000577As the hosting was moved to freedesktop, git hooks are deployed to update the
578website. Manually check that it is updated 5-10 minutes after the final <code>git push</code>
Emil Velikov2edc29a2016-11-16 18:25:41 +0000579</p>
580
Andres Gomeze0f7d252017-03-27 21:48:10 +0300581
Emil Velikov2edc29a2016-11-16 18:25:41 +0000582<h1 id="bugzilla">Update Bugzilla</h1>
583
584<p>
585Parse through the bugreports as listed in the docs/relnotes/X.Y.Z.html
586document.
587<br>
588If there's outstanding action, close the bug referencing the commit ID which
589addresses the bug and mention the Mesa version that has the fix.
590</p>
591
592<p>
593Note: the above is not applicable to all the reports, so use common sense.
594</p>
595
596
597</div>
598</body>
599</html>