17ec681f3SmrgReleasing Process 27ec681f3Smrg================= 37ec681f3Smrg 47ec681f3SmrgOverview 57ec681f3Smrg-------- 67ec681f3Smrg 77ec681f3SmrgThis document uses the convention X.Y.Z for the release number with X.Y 87ec681f3Smrgbeing the stable branch name. 97ec681f3Smrg 107ec681f3SmrgMesa provides feature and bugfix releases. Former use zero as patch 117ec681f3Smrgversion (Z), while the latter have a non-zero one. 127ec681f3Smrg 137ec681f3SmrgFor example: 147ec681f3Smrg 157ec681f3Smrg:: 167ec681f3Smrg 177ec681f3Smrg Mesa 10.1.0 - 10.1 branch, feature 187ec681f3Smrg Mesa 10.1.4 - 10.1 branch, bugfix 197ec681f3Smrg Mesa 12.0.0 - 12.0 branch, feature 207ec681f3Smrg Mesa 12.0.2 - 12.0 branch, bugfix 217ec681f3Smrg 227ec681f3Smrg.. _schedule: 237ec681f3Smrg 247ec681f3SmrgRelease schedule 257ec681f3Smrg---------------- 267ec681f3Smrg 277ec681f3SmrgReleases should happen on Wednesdays. Delays can occur although those 287ec681f3Smrgshould be kept to a minimum. 297ec681f3Smrg 307ec681f3SmrgSee our :doc:`calendar <release-calendar>` for information about how 317ec681f3Smrgthe release schedule is planned, and the date and other details for 327ec681f3Smrgindividual releases. 337ec681f3Smrg 347ec681f3SmrgFeature releases 357ec681f3Smrg---------------- 367ec681f3Smrg 377ec681f3Smrg- Available approximately every three months. 387ec681f3Smrg- Feature releases are branched on or around the second Wednesday of 397ec681f3Smrg January, April, July, and October. 407ec681f3Smrg- Initial time plan available 2-4 weeks before the planned branchpoint 417ec681f3Smrg (rc1) on the mesa-announce@ mailing list. 427ec681f3Smrg- Typically, the final release will happen after 4 candidates. 437ec681f3Smrg Additional ones may be needed in order to resolve blocking 447ec681f3Smrg regressions, though. 457ec681f3Smrg 467ec681f3SmrgStable releases 477ec681f3Smrg--------------- 487ec681f3Smrg 497ec681f3Smrg- Normally available once every two weeks. 507ec681f3Smrg- Only the latest branch has releases. See note below. 517ec681f3Smrg 527ec681f3Smrg.. note:: 537ec681f3Smrg 547ec681f3Smrg There is one or two releases overlap when changing branches. For 557ec681f3Smrg example: 567ec681f3Smrg 577ec681f3Smrg The final release from the 12.0 series Mesa 12.0.5 will be out around 587ec681f3Smrg the same time (or shortly after) 13.0.1 is out. 597ec681f3Smrg 607ec681f3Smrg This also involves that, as a final release may be delayed due to the 617ec681f3Smrg need of additional candidates to solve some blocking regression(s), the 627ec681f3Smrg release manager might have to update the 637ec681f3Smrg :doc:`calendar <release-calendar>` with additional bug fix releases of 647ec681f3Smrg the current stable branch. 657ec681f3Smrg 667ec681f3Smrg.. _pickntest: 677ec681f3Smrg 687ec681f3SmrgCherry-picking and testing 697ec681f3Smrg-------------------------- 707ec681f3Smrg 717ec681f3SmrgCommits nominated for the active branch are picked as based on the 727ec681f3Smrg:ref:`criteria <criteria>` as described in the same 737ec681f3Smrgsection. 747ec681f3Smrg 757ec681f3SmrgNominations happen via special tags in the commit messages, and via 767ec681f3SmrgGitLab merge requests against the staging branches. There are special 777ec681f3Smrgscripts used to read the tags. 787ec681f3Smrg 797ec681f3SmrgThe maintainer should watch or be in contact with the Intel CI team, as 807ec681f3Smrgwell as watch the GitLab CI for regressions. 817ec681f3Smrg 827ec681f3SmrgCherry picking should be done with the '-x' switch (to automatically add 837ec681f3Smrg"cherry picked from ..." to the commit message): 847ec681f3Smrg 857ec681f3Smrg``git cherry-pick -x abcdef12345667890`` 867ec681f3Smrg 877ec681f3SmrgDevelopers can request, *as an exception*, patches to be applied up-to 887ec681f3Smrgthe last one hour before the actual release. This is made **only** with 897ec681f3Smrgexplicit permission/request, and the patch **must** be very well 907ec681f3Smrgcontained. Thus it cannot affect more than one driver/subsystem. 917ec681f3Smrg 927ec681f3SmrgFollowing developers have requested permanent exception 937ec681f3Smrg 947ec681f3Smrg- *Ilia Mirkin* 957ec681f3Smrg- *AMD team* 967ec681f3Smrg 977ec681f3SmrgThe GitLab CI must pass. 987ec681f3Smrg 997ec681f3SmrgFor Windows related changes, the main contact point is Brian Paul. Jose 1007ec681f3SmrgFonseca can also help as a fallback contact. 1017ec681f3Smrg 1027ec681f3SmrgFor Android related changes, the main contact is Tapani Pälli. Mauro 1037ec681f3SmrgRossi is collaborating with Android-x86 and may provide feedback about 1047ec681f3Smrgthe build status in that project. 1057ec681f3Smrg 1067ec681f3SmrgFor MacOSX related changes, Jeremy Huddleston Sequoia is currently a 1077ec681f3Smrggood contact point. 1087ec681f3Smrg 1097ec681f3Smrg.. note:: 1107ec681f3Smrg 1117ec681f3Smrg If a patch in the current queue needs any additional fix(es), 1127ec681f3Smrg then they should be squashed together. The commit messages and the 1137ec681f3Smrg "``cherry picked from``"-tags must be preserved. 1147ec681f3Smrg 1157ec681f3Smrg .. code-block:: console 1167ec681f3Smrg 1177ec681f3Smrg git show b10859ec41d09c57663a258f43fe57c12332698e 1187ec681f3Smrg 1197ec681f3Smrg commit b10859ec41d09c57663a258f43fe57c12332698e 1207ec681f3Smrg Author: Jonas Pfeil <pfeiljonas@gmx.de> 1217ec681f3Smrg Date: Wed Mar 1 18:11:10 2017 +0100 1227ec681f3Smrg 1237ec681f3Smrg ralloc: Make sure ralloc() allocations match malloc()'s alignment. 1247ec681f3Smrg 1257ec681f3Smrg The header of ralloc needs to be aligned, because the compiler assumes 1267ec681f3Smrg ... 1277ec681f3Smrg 1287ec681f3Smrg (cherry picked from commit cd2b55e536dc806f9358f71db438dd9c246cdb14) 1297ec681f3Smrg 1307ec681f3Smrg Squashed with commit: 1317ec681f3Smrg 1327ec681f3Smrg ralloc: don't leave out the alignment factor 1337ec681f3Smrg 1347ec681f3Smrg Experimentation shows that without alignment factor GCC and Clang choose 1357ec681f3Smrg ... 1367ec681f3Smrg 1377ec681f3Smrg (cherry picked from commit ff494fe999510ea40e3ed5827e7818550b6de126) 1387ec681f3Smrg 1397ec681f3SmrgRegression/functionality testing 1407ec681f3Smrg-------------------------------- 1417ec681f3Smrg 1427ec681f3Smrg- *no regressions should be observed for Piglit/dEQP/CTS/Vulkan on 1437ec681f3Smrg Intel platforms* 1447ec681f3Smrg- *no regressions should be observed for Piglit using the swrast, 1457ec681f3Smrg softpipe and llvmpipe drivers* 1467ec681f3Smrg 1477ec681f3Smrg.. _stagingbranch: 1487ec681f3Smrg 1497ec681f3SmrgStaging branch 1507ec681f3Smrg-------------- 1517ec681f3Smrg 1527ec681f3SmrgA live branch, which contains the currently merge/rejected patches is 1537ec681f3Smrgavailable in the main repository under ``staging/X.Y``. For example: 1547ec681f3Smrg 1557ec681f3Smrg:: 1567ec681f3Smrg 1577ec681f3Smrg staging/18.1 - WIP branch for the 18.1 series 1587ec681f3Smrg staging/18.2 - WIP branch for the 18.2 series 1597ec681f3Smrg 1607ec681f3SmrgNotes: 1617ec681f3Smrg 1627ec681f3Smrg- People are encouraged to test the staging branch and report 1637ec681f3Smrg regressions. 1647ec681f3Smrg- The branch history is not stable and it **will** be rebased, 1657ec681f3Smrg 1667ec681f3SmrgMaking a branchpoint 1677ec681f3Smrg-------------------- 1687ec681f3Smrg 1697ec681f3SmrgA branchpoint is made such that new development can continue in parallel 1707ec681f3Smrgto stabilization and bugfixing. 1717ec681f3Smrg 1727ec681f3Smrg.. note:: 1737ec681f3Smrg 1747ec681f3Smrg Before doing a branch ensure that basic build and ``meson test`` 1757ec681f3Smrg testing is done and there are little to-no issues. Ideally all of those 1767ec681f3Smrg should be tackled already. 1777ec681f3Smrg 1787ec681f3SmrgCheck if the version number is going to remain as, alternatively 1797ec681f3Smrg``git mv docs/relnotes/{current,new}.rst`` as appropriate. 1807ec681f3Smrg 1817ec681f3SmrgTo setup the branchpoint: 1827ec681f3Smrg 1837ec681f3Smrg.. code-block:: console 1847ec681f3Smrg 1857ec681f3Smrg git checkout main # make sure we're in main first 1867ec681f3Smrg git tag -s X.Y-branchpoint -m "Mesa X.Y branchpoint" 1877ec681f3Smrg git checkout -b X.Y 1887ec681f3Smrg git checkout main 1897ec681f3Smrg $EDITOR VERSION # bump the version number 1907ec681f3Smrg git commit -as 1917ec681f3Smrg truncate docs/relnotes/new_features.txt 1927ec681f3Smrg git commit -a 1937ec681f3Smrg git push origin X.Y-branchpoint X.Y 1947ec681f3Smrg 1957ec681f3SmrgNow go to 1967ec681f3Smrg`GitLab <https://gitlab.freedesktop.org/mesa/mesa/-/milestones>`__ and 1977ec681f3Smrgadd the new Mesa version X.Y. 1987ec681f3Smrg 1997ec681f3SmrgCheck that there are no distribution breaking changes and revert them if 2007ec681f3Smrgneeded. For example: files being overwritten on install, etc. Happens 2017ec681f3Smrgextremely rarely - we had only one case so far (see commit 2027ec681f3Smrg2ced8eb136528914e1bf4e000dea06a9d53c7e04). 2037ec681f3Smrg 2047ec681f3SmrgMaking a new release 2057ec681f3Smrg-------------------- 2067ec681f3Smrg 2077ec681f3SmrgThese are the instructions for making a new Mesa release. 2087ec681f3Smrg 2097ec681f3SmrgGet latest source files 2107ec681f3Smrg~~~~~~~~~~~~~~~~~~~~~~~ 2117ec681f3Smrg 2127ec681f3SmrgEnsure the latest code is available - both in your local main and the 2137ec681f3Smrgrelevant branch. 2147ec681f3Smrg 2157ec681f3SmrgPerform basic testing 2167ec681f3Smrg~~~~~~~~~~~~~~~~~~~~~ 2177ec681f3Smrg 2187ec681f3SmrgMost of the testing should already be done during the 2197ec681f3Smrg:ref:`cherry-pick <pickntest>` So we do a quick 'touch test' 2207ec681f3Smrg 2217ec681f3Smrg- meson dist 2227ec681f3Smrg- the produced binaries work 2237ec681f3Smrg 2247ec681f3SmrgHere is one solution: 2257ec681f3Smrg 2267ec681f3Smrg.. code-block:: console 2277ec681f3Smrg 2287ec681f3Smrg __glxgears_cmd='glxgears 2>&1 | grep -v "configuration file"' 2297ec681f3Smrg __es2info_cmd='es2_info 2>&1 | egrep "GL_VERSION|GL_RENDERER|.*dri\.so"' 2307ec681f3Smrg __es2gears_cmd='es2gears_x11 2>&1 | grep -v "configuration file"' 2317ec681f3Smrg test "x$LD_LIBRARY_PATH" != 'x' && __old_ld="$LD_LIBRARY_PATH" 2327ec681f3Smrg export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/:"${__old_ld}" 2337ec681f3Smrg export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/ 2347ec681f3Smrg export LIBGL_DEBUG=verbose 2357ec681f3Smrg eval $__glxinfo_cmd 2367ec681f3Smrg eval $__glxgears_cmd 2377ec681f3Smrg eval $__es2info_cmd 2387ec681f3Smrg eval $__es2gears_cmd 2397ec681f3Smrg export LIBGL_ALWAYS_SOFTWARE=true 2407ec681f3Smrg eval $__glxinfo_cmd 2417ec681f3Smrg eval $__glxgears_cmd 2427ec681f3Smrg eval $__es2info_cmd 2437ec681f3Smrg eval $__es2gears_cmd 2447ec681f3Smrg export LIBGL_ALWAYS_SOFTWARE=true 2457ec681f3Smrg export GALLIUM_DRIVER=softpipe 2467ec681f3Smrg eval $__glxinfo_cmd 2477ec681f3Smrg eval $__glxgears_cmd 2487ec681f3Smrg eval $__es2info_cmd 2497ec681f3Smrg eval $__es2gears_cmd 2507ec681f3Smrg # Smoke test DOTA2 2517ec681f3Smrg unset LD_LIBRARY_PATH 2527ec681f3Smrg test "x$__old_ld" != 'x' && export LD_LIBRARY_PATH="$__old_ld" && unset __old_ld 2537ec681f3Smrg unset LIBGL_DRIVERS_PATH 2547ec681f3Smrg unset LIBGL_DEBUG 2557ec681f3Smrg unset LIBGL_ALWAYS_SOFTWARE 2567ec681f3Smrg unset GALLIUM_DRIVER 2577ec681f3Smrg export VK_ICD_FILENAMES=`pwd`/test/usr/local/share/vulkan/icd.d/intel_icd.x86_64.json 2587ec681f3Smrg steam steam://rungameid/570 -vconsole -vulkan 2597ec681f3Smrg unset VK_ICD_FILENAMES 2607ec681f3Smrg 2617ec681f3SmrgCreate release notes for the new release 2627ec681f3Smrg~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2637ec681f3Smrg 2647ec681f3SmrgThe release notes are completely generated by the 2657ec681f3Smrg``bin/gen_release_notes.py`` script. Simply run this script **before** 2667ec681f3Smrgbumping the version. You'll need to come back to this file once the 2677ec681f3Smrgtarball is generated to add its ``sha256sum``. 2687ec681f3Smrg 2697ec681f3SmrgIncrement the version contained in the file ``VERSION`` at Mesa's top-level, 2707ec681f3Smrgthen commit this change and **push the branch** (if you forget to do 2717ec681f3Smrgthis, ``release.sh`` below will fail). 2727ec681f3Smrg 2737ec681f3SmrgUse the release.sh script from xorg `util-modular <https://cgit.freedesktop.org/xorg/util/modular/>`__ 2747ec681f3Smrg~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2757ec681f3Smrg 2767ec681f3SmrgStart the release process. 2777ec681f3Smrg 2787ec681f3Smrg.. code-block:: console 2797ec681f3Smrg 2807ec681f3Smrg ../relative/path/to/release.sh . # append --dist if you've already done distcheck above 2817ec681f3Smrg 2827ec681f3SmrgPay close attention to the prompts as you might be required to enter 2837ec681f3Smrgyour GPG and SSH passphrase(s) to sign and upload the files, 2847ec681f3Smrgrespectively. 2857ec681f3Smrg 2867ec681f3SmrgEnsure that you do sign the tarballs, that your key is mentioned in the 2877ec681f3Smrgrelease notes, and is published in `release-maintainers-keys.asc 2887ec681f3Smrg<release-maintainers-keys.asc>`__. 2897ec681f3Smrg 2907ec681f3Smrg 2917ec681f3SmrgAdd the sha256sums to the release notes 2927ec681f3Smrg~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2937ec681f3Smrg 2947ec681f3SmrgEdit ``docs/relnotes/X.Y.Z.rst`` to add the ``sha256sum`` as available in the 2957ec681f3Smrg``mesa-X.Y.Z.announce`` template. Commit this change. 2967ec681f3Smrg 2977ec681f3SmrgBack on mesa main, add the new release notes into the tree 2987ec681f3Smrg~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2997ec681f3Smrg 3007ec681f3SmrgSomething like the following steps will do the trick: 3017ec681f3Smrg 3027ec681f3Smrg.. code-block:: console 3037ec681f3Smrg 3047ec681f3Smrg git cherry-pick -x X.Y~1 3057ec681f3Smrg git cherry-pick -x X.Y 3067ec681f3Smrg 3077ec681f3SmrgThen run the 3087ec681f3Smrg 3097ec681f3Smrg.. code-block:: console 3107ec681f3Smrg 3117ec681f3Smrg ./bin/post_version.py X.Y.Z 3127ec681f3Smrg 3137ec681f3Smrg, where X.Y.Z is the version you just made. This will update 3147ec681f3Smrgdocs/relnotes.rst and docs/release-calendar.csv. It will then generate 3157ec681f3Smrga Git commit automatically. Check that everything looks correct and 3167ec681f3Smrgpush: 3177ec681f3Smrg 3187ec681f3Smrg.. code-block:: console 3197ec681f3Smrg 3207ec681f3Smrg git push origin main X.Y 3217ec681f3Smrg 3227ec681f3SmrgAnnounce the release 3237ec681f3Smrg-------------------- 3247ec681f3Smrg 3257ec681f3SmrgUse the generated template during the releasing process. 3267ec681f3Smrg 3277ec681f3SmrgAgain, pay attention to add a note to warn about a final release in a 3287ec681f3Smrgseries, if that is the case. 3297ec681f3Smrg 3307ec681f3SmrgUpdate GitLab issues 3317ec681f3Smrg-------------------- 3327ec681f3Smrg 3337ec681f3SmrgParse through the bug reports as listed in the docs/relnotes/X.Y.Z.rst 3347ec681f3Smrgdocument. If there's outstanding action, close the bug referencing the 3357ec681f3Smrgcommit ID which addresses the bug and mention the Mesa version that has 3367ec681f3Smrgthe fix. 3377ec681f3Smrg 3387ec681f3Smrg.. note: the above is not applicable to all the reports, so use common sense. 339