- Mesa 10.1.0 - 10.1 branch, feature - Mesa 10.1.4 - 10.1 branch, bugfix - Mesa 12.0.0 - 12.0 branch, feature - Mesa 12.0.2 - 12.0 branch, bugfix +Mesa 10.1.0 - 10.1 branch, feature +Mesa 10.1.4 - 10.1 branch, bugfix +Mesa 12.0.0 - 12.0 branch, feature +Mesa 12.0.2 - 12.0 branch, bugfix@@ -69,22 +67,18 @@ date and other details for individual releases.
@@ -114,20 +108,24 @@ described in the same section.
-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. +Nominations happen via special tags in the commit messages, and via gitlab +merge requests against the staging branches. There are special scripts used +to read the tags.
-Maintainer is also responsible for testing in various possible permutations of -the meson and scons build. +The maintainer should watch or be in contact with the Intel CI team, as well +as watch the gitlab CI for regressions.
-+Cherry picking should be done with the '-x' switch (to automatically add +"cherry picked from ..." to the commit message): +
-Done continuously up-to the pre-release announcement.
+
+git cherry-pick -x abcdef12345667890
+
Developers can request, as an exception, patches to be applied up-to @@ -138,24 +136,11 @@ well contained. Thus it cannot affect more than one driver/subsystem.
Following developers have requested permanent exception
The following must pass:
--These are achieved by combination of local testing, -which includes mingw-w64 cross compilation and AppVeyor plus Travis-CI, the -latter two as part of their Github integration. -
+The gitlab CI must pass.
For Windows related changes, the main contact point is Brian
@@ -179,57 +164,38 @@ 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 +git show b10859ec41d09c57663a258f43fe57c12332698e - commit b10859ec41d09c57663a258f43fe57c12332698e - Author: Jonas Pfeil <pfeiljonas@gmx.de> - Date: Wed Mar 1 18:11:10 2017 +0100 +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. + ralloc: Make sure ralloc() allocations match malloc()'s alignment. - The header of ralloc needs to be aligned, because the compiler assumes - ... + The header of ralloc needs to be aligned, because the compiler assumes + ... - (cherry picked from commit cd2b55e536dc806f9358f71db438dd9c246cdb14) + (cherry picked from commit cd2b55e536dc806f9358f71db438dd9c246cdb14) - Squashed with commit: + Squashed with commit: - ralloc: don't leave out the alignment factor + ralloc: don't leave out the alignment factor - Experimentation shows that without alignment factor gcc and clang choose - ... + Experimentation shows that without alignment factor gcc and clang choose + ... - (cherry picked from commit ff494fe999510ea40e3ed5827e7818550b6de126) + (cherry picked from commit ff494fe999510ea40e3ed5827e7818550b6de126)
-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. -
-
@@ -237,8 +203,8 @@ A live branch, which contains the currently merge/rejected patches is available
in the main repository under staging/X.Y. For example:
- staging/18.1 - WIP branch for the 18.1 series - staging/18.2 - WIP branch for the 18.2 series +staging/18.1 - WIP branch for the 18.1 series +staging/18.2 - WIP branch for the 18.2 series
@@ -272,15 +238,15 @@ Check if the version number is going to remain as, alternatively To setup the branchpoint:
- git checkout master # make sure we're in master first
- git tag -s X.Y-branchpoint -m "Mesa X.Y branchpoint"
- git checkout -b X.Y
- 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
+git checkout master # make sure we're in master first
+git tag -s X.Y-branchpoint -m "Mesa X.Y branchpoint"
+git checkout -b X.Y
+git checkout master
+$EDITOR VERSION # bump the version number
+git commit -as
+truncate docs/relnotes/new_features.txt
+git commit -a
+git push origin X.Y-branchpoint X.Y
@@ -294,162 +260,6 @@ 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. -
- - --It comes shortly after outstanding patches in the respective branch are pushed. -Developers can check, in brief, what's the status of their patches. They, -alongside very early testers, are strongly encouraged to test the branch and -report any regressions. -
--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. -
- --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 -is followed by a brief information. The release maintainer is human so if you -believe you've spotted a mistake do let them know. -
- --Subject: [ANNOUNCE] Mesa X.Y.Z release candidate -To: mesa-announce@... -Cc: mesa-dev@... - -Hello list, - -The candidate for the Mesa X.Y.Z is now available. Currently we have: - - NUMBER queued - - 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. - - -Testing reports/general approval --------------------------------- -Any testing reports (or general approval of the state of the branch) will be -greatly appreciated. - -The plan is to have X.Y.Z this DAY (DATE), around or shortly after TIME. - -If you have any questions or suggestions - be that about the current patch -queue or otherwise, please go ahead. - - -Trivial merge conflicts ------------------------ -List of commits where manual intervention was required. -Keep the authors in the CC list. - -commit SHA -Author: AUTHOR - - COMMIT SUMMARY - - CHERRY PICKED FROM - - -For example: - -commit 990f395e007c3204639daa34efc3049f350ee819 -Author: Emil Velikov <emil.velikov@collabora.com> - - anv: automake: cleanup the generated json file during make clean - - (cherry picked from commit 8df581520a823564be0ab5af7dbb7d501b1c9670) - - -Cheers, -Emil - - -Mesa stable queue ------------------ - -Nominated (NUMBER) -================== - -AUTHOR (NUMBER): - SHA COMMIT SUMMARY - -For example: - -Dave Airlie (1): - 2de85eb radv: fix texturesamples to handle single sample case - - -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) -================= - -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. -- -
@@ -467,15 +277,14 @@ relevant branch.
Most of the testing should already be done during the -cherry-pick and -pre-announce stages. +cherry-pick So we do a quick 'touch test'
@@ -483,69 +292,53 @@ So we do a quick 'touch test'
- __glxgears_cmd='glxgears 2>&1 | grep -v "configuration file"'
- __es2info_cmd='es2_info 2>&1 | egrep "GL_VERSION|GL_RENDERER|.*dri\.so"'
- __es2gears_cmd='es2gears_x11 2>&1 | grep -v "configuration file"'
- test "x$LD_LIBRARY_PATH" != 'x' && __old_ld="$LD_LIBRARY_PATH"
- export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/:"${__old_ld}"
- export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/
- export LIBGL_DEBUG=verbose
- eval $__glxinfo_cmd
- eval $__glxgears_cmd
- eval $__es2info_cmd
- eval $__es2gears_cmd
- export LIBGL_ALWAYS_SOFTWARE=true
- eval $__glxinfo_cmd
- eval $__glxgears_cmd
- eval $__es2info_cmd
- eval $__es2gears_cmd
- export LIBGL_ALWAYS_SOFTWARE=true
- export GALLIUM_DRIVER=softpipe
- eval $__glxinfo_cmd
- eval $__glxgears_cmd
- eval $__es2info_cmd
- eval $__es2gears_cmd
- # Smoke test DOTA2
- unset LD_LIBRARY_PATH
- test "x$__old_ld" != 'x' && export LD_LIBRARY_PATH="$__old_ld" && unset __old_ld
- unset LIBGL_DRIVERS_PATH
- unset LIBGL_DEBUG
- unset LIBGL_ALWAYS_SOFTWARE
- unset GALLIUM_DRIVER
- export VK_ICD_FILENAMES=`pwd`/test/usr/local/share/vulkan/icd.d/intel_icd.x86_64.json
- steam steam://rungameid/570 -vconsole -vulkan
- unset VK_ICD_FILENAMES
+__glxgears_cmd='glxgears 2>&1 | grep -v "configuration file"'
+__es2info_cmd='es2_info 2>&1 | egrep "GL_VERSION|GL_RENDERER|.*dri\.so"'
+__es2gears_cmd='es2gears_x11 2>&1 | grep -v "configuration file"'
+test "x$LD_LIBRARY_PATH" != 'x' && __old_ld="$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/:"${__old_ld}"
+export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/
+export LIBGL_DEBUG=verbose
+eval $__glxinfo_cmd
+eval $__glxgears_cmd
+eval $__es2info_cmd
+eval $__es2gears_cmd
+export LIBGL_ALWAYS_SOFTWARE=true
+eval $__glxinfo_cmd
+eval $__glxgears_cmd
+eval $__es2info_cmd
+eval $__es2gears_cmd
+export LIBGL_ALWAYS_SOFTWARE=true
+export GALLIUM_DRIVER=softpipe
+eval $__glxinfo_cmd
+eval $__glxgears_cmd
+eval $__es2info_cmd
+eval $__es2gears_cmd
+# Smoke test DOTA2
+unset LD_LIBRARY_PATH
+test "x$__old_ld" != 'x' && export LD_LIBRARY_PATH="$__old_ld" && unset __old_ld
+unset LIBGL_DRIVERS_PATH
+unset LIBGL_DEBUG
+unset LIBGL_ALWAYS_SOFTWARE
+unset GALLIUM_DRIVER
+export VK_ICD_FILENAMES=`pwd`/test/usr/local/share/vulkan/icd.d/intel_icd.x86_64.json
+steam steam://rungameid/570 -vconsole -vulkan
+unset VK_ICD_FILENAMES
--Increment the version contained in the file VERSION at Mesa's top-level, then -commit this change. -
--Create a new file docs/relnotes/X.Y.Z.html, (follow the style of the previous -release notes). Note that the sha256sums section of the release notes should -be empty (TBD) at this point. -
+The release notes are completely generated by the +bin/gen_release_notes.py script. Simply run this script before
+bumping the version, and commit the results.
--Two scripts are available to help generate portions of the release notes: +The only thing left to do is add the sha256 sums.
-- ./bin/bugzilla_mesa.sh - ./bin/shortlog_mesa.sh --
-The first script identifies commits that reference bugzilla bugs and obtains -the descriptions of those bugs from bugzilla. The second script generates a -log of all commits. In both cases, HTML-formatted lists are printed to stdout -to be included in the release notes. +Increment the version contained in the file VERSION at Mesa's top-level, then +commit this change.
@@ -553,7 +346,7 @@ Commit these changes and push the branch.
- git push origin HEAD +git push origin HEAD@@ -564,9 +357,7 @@ Start the release process.
- # For the dist/distcheck, you may want to specify which LLVM to use: - # export LLVM_CONFIG=/usr/lib/llvm-3.9/bin/llvm-config - ../relative/path/to/release.sh . # append --dist if you've already done distcheck above +../relative/path/to/release.sh . # append --dist if you've already done distcheck above
@@ -577,7 +368,7 @@ and SSH passphrase(s) to sign and upload the files, respectively.
-Edit docs/relnotes/X.Y.Z.html to add the sha256sums as available in the mesa-X.Y.Z.announce template. Commit this change. +Edit docs/relnotes/X.Y.Z.html to add the sha256sum as available in the mesa-X.Y.Z.announce template. Commit this change.
- git cherry-pick -x X.Y~1 - git cherry-pick -x X.Y +git cherry-pick -x X.Y~1 +git cherry-pick -x X.Y-
-Also, edit docs/relnotes.html to add a link to the new release notes, -edit docs/index.html to add a news entry and a note in case of the -last release in a series, and remove the version from -docs/release-calendar.html. Then commit and push: +
Then run the
./bin/post_version.py X.Y.Z, where X.Y.Z is the +version you just made. This will updated docs/relnotes.html, +docs/index.html, and docs/release-calendar.html. It will then generate +a git commit automatically. Check that everything looks correct and push:
- git commit -as -m "docs: update calendar, add news item and link release notes for X.Y.Z" git push origin master X.Y@@ -616,18 +405,10 @@ series, if that is the case. -
-As the hosting was moved to freedesktop, git hooks are deployed to update the
-website. Manually check that it is updated 5-10 minutes after the final git push
-
-Parse through the bugreports as listed in the docs/relnotes/X.Y.Z.html +Parse through the bug reports as listed in the docs/relnotes/X.Y.Z.html document. If there's outstanding action, close the bug referencing the commit ID which addresses the bug and mention the Mesa version that has the fix.