X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=docs%2Freleasing.html;h=14315e7a8e4e05bdf9c882a89b8ae5509458bc9a;hb=4f51e8880d1c0ba072f9f7a10f955ad79c30e991;hp=d650910075a601afa792f3c956fc98576b05454e;hpb=0f8afde7baf2b4764c3832387607021f2d318f6e;p=mesa.git diff --git a/docs/releasing.html b/docs/releasing.html index d650910075a..14315e7a8e4 100644 --- a/docs/releasing.html +++ b/docs/releasing.html @@ -14,6 +14,7 @@
+

Releasing process

+

Overview

@@ -48,20 +50,24 @@ For example: Mesa 12.0.2 - 12.0 branch, bugfix +

Release schedule

-Releases should happen on Fridays. Delays can occur although those should be keep -to a minimum. +Releases should happen on Wednesdays. Delays can occur although those +should be keep to a minimum. +
+See our calendar for the +date and other details for individual releases.

Feature releases

Stable releases

@@ -69,7 +75,7 @@ approximatelly 24 hours before the final (non-rc) release.
  • Normally available once every two weeks.
  • Only the latest branch has releases. See note below.
  • A pre-release announcement should be available -approximatelly 48 hours before the actual release. +approximately 48 hours before the actual release.

    @@ -79,15 +85,24 @@ The final release from the 12.0 series Mesa 12.0.5 will be out around the same time (or shortly after) 13.0.1 is out.

    +

    Cherry-picking and testing

    Commits nominated for the active branch are picked as based on the criteria as described in the same section. +

    -Maintainer is responsible for testing in various possible permutations of +Nomination happens in the mesa-stable@ mailing list. However, +maintainer is responsible of checking for forgotten candidates in the +master branch. This is achieved by a combination of ad-hoc scripts and +a casual search for terms such as regression, fix, broken and similar. +

    + +

    +Maintainer is also responsible for testing in various possible permutations of the autoconf and scons build.

    @@ -101,36 +116,99 @@ release. This is made only with explicit permission/request, and the patch must be very well contained. Thus it cannot affect more than one driver/subsystem.

    +

    Currently Ilia Mirkin and AMD devs have requested "permanent" exception.

    - + +

    +Achieved by combination of local ad-hoc scripts, mingw-w64 cross +compilation and AppVeyor plus Travis-CI, the latter as part of their +Github integration. +

    +

    -Achieved by combination of local ad-hoc scripts and AppVeyor plus Travis-CI, -the latter as part of their Github integration. +For Windows related changes, the main contact point is Brian +Paul. Jose Fonseca can also help as a fallback contact.

    +

    +For Android related changes, the main contact is Tapani +Pälli. Mauro Rossi is collaborating with android-x86 and may +provide feedback about the build status in that project. +

    + +

    +For MacOSX related changes, Jeremy Huddleston Sequoia is currently a +good contact point. +

    + +

    +Note: If a patch in the current queue needs any additional +fix(es), then they should be squashed together. +
    +The commit messages and the cherry picked from tags must be preserved. +

    + +

    +This should be noted in the pre-announce email. +

    + +
    +    git show b10859ec41d09c57663a258f43fe57c12332698e
+
+    commit b10859ec41d09c57663a258f43fe57c12332698e
+    Author: Jonas Pfeil <pfeiljonas@gmx.de>
+    Date:   Wed Mar 1 18:11:10 2017 +0100
+
+        ralloc: Make sure ralloc() allocations match malloc()'s alignment.
+
+        The header of ralloc needs to be aligned, because the compiler assumes
+        ...
+
+        (cherry picked from commit cd2b55e536dc806f9358f71db438dd9c246cdb14)
+
+        Squashed with commit:
+
+        ralloc: don't leave out the alignment factor
+
+        Experimentation shows that without alignment factor gcc and clang choose
+        ...
+
+        (cherry picked from commit ff494fe999510ea40e3ed5827e7818550b6de126)
+
    +

    Regression/functionality testing

    Less often (once or twice), shortly before the pre-release announcement. Ensure that testing is redone if Intel devs have requested an exception, as per above.

    + +

    Currently 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.

    +

    +Installing the built driver from the pre-announced RC branch in the +system and making some every day's use until the release may be a good +idea too. +

    +

    Making a branchpoint

    @@ -161,6 +239,8 @@ To setup the branchpoint: git checkout master $EDITOR VERSION # bump the version number git commit -as + cp docs/relnotes/{X.Y,X.Y+1}.html # copy/create relnotes template + git commit -as git push origin X.Y-branchpoint X.Y @@ -168,15 +248,18 @@ To setup the branchpoint: Now go to Bugzilla and add the new Mesa version X.Y.

    +

    -Check for rare that there are no distribution breaking changes and revert them -if needed. Extremely rare - we had only one case so far (see -commit 2ced8eb136528914e1bf4e000dea06a9d53c7e04). +Check that there are no distribution breaking changes and revert them if needed. +For example: files being overwritten on install, etc. Happens extremely rarely - +we had only one case so far (see commit 2ced8eb136528914e1bf4e000dea06a9d53c7e04).

    +

    Proceed to release -rc1.

    +

    Pre-release announcement

    @@ -189,19 +272,28 @@ It is followed by a brief period (normally 24 or 48 hours) before the actual release is made.

    +

    +Be aware to add a note to warn about a final release in a series, if +that is the case. +

    +

    Terminology used

    + +

    Patch that is nominated but yet to to merged in the patch queue/branch.

    +

    Patch is in the queue/branch and will feature in the next release. Barring reported regressions or objections from developers.

    +

    Patch does not fit the criteria and @@ -224,6 +316,10 @@ The candidate for the Mesa X.Y.Z is now available. Currently we have: - NUMBER nominated (outstanding) - and NUMBER rejected patches +[If applicable: +Note: this is the final anticipated release in the SERIES series. Users are +encouraged to migrate to the NEXT_SERIES series in order to obtain future fixes.] + BRIEF SUMMARY OF CHANGES Take a look at section "Mesa stable queue" for more information. @@ -287,20 +383,35 @@ Queued (NUMBER) AUTHOR (NUMBER): COMMIT SUMMARY +[If applicable: +Squashed with + COMMIT SUMMARY] + +For example: + +Jonas Pfeil (1): + ralloc: Make sure ralloc() allocations match malloc()'s alignment. +Squashed with + ralloc: don't leave out the alignment factor Rejected (NUMBER) ================= -Rejected (11) -============= - AUTHOR (NUMBER): SHA COMMIT SUMMARY Reason: ... + +For example: + +Emil Velikov (1) + a39ad18 configure.ac: honour LLVM_LIBDIR when linking against LLVM + +Reason: The patch was reverted shortly after it was merged. +

    Making a new release

    @@ -308,18 +419,21 @@ These are the instructions for making a new Mesa release.

    Get latest source files

    +

    Ensure the latest code is available - both in your local master and the relevant branch.

    Perform basic testing

    +

    Most of the testing should already be done during the cherry-pick and pre-announce stages. - So we do a quick 'touch test' +

    +