Lines Matching +full:cherry +full:- +full:pick
5 --------
11 version (Z), while the latter have a non-zero one.
17 Mesa 10.1.0 - 10.1 branch, feature
18 Mesa 10.1.4 - 10.1 branch, bugfix
19 Mesa 12.0.0 - 12.0 branch, feature
20 Mesa 12.0.2 - 12.0 branch, bugfix
25 ----------------
30 See our :doc:`calendar <release-calendar>` for information about how
35 ----------------
37 - Available approximately every three months.
38 - Feature releases are branched on or around the second Wednesday of
40 - Initial time plan available 2-4 weeks before the planned branchpoint
41 (rc1) on the mesa-announce@ mailing list.
42 - Typically, the final release will happen after 4 candidates.
47 ---------------
49 - Normally available once every two weeks.
50 - Only the latest branch has releases. See note below.
63 :doc:`calendar <release-calendar>` with additional bug fix releases of
68 Cherry-picking and testing
69 --------------------------
82 Cherry picking should be done with the '-x' switch (to automatically add
83 "cherry picked from ..." to the commit message):
85 ``git cherry-pick -x abcdef12345667890``
87 Developers can request, *as an exception*, patches to be applied up-to
94 - *Ilia Mirkin*
95 - *AMD team*
103 Rossi is collaborating with Android-x86 and may provide feedback about
113 "``cherry picked from``"-tags must be preserved.
115 .. code-block:: text
128 (cherry picked from commit cd2b55e536dc806f9358f71db438dd9c246cdb14)
137 (cherry picked from commit ff494fe999510ea40e3ed5827e7818550b6de126)
140 --------------------------------
142 - *no regressions should be observed for Piglit/dEQP/CTS/Vulkan on
144 - *no regressions should be observed for Piglit using the Softpipe
150 --------------
157 staging/18.1 - WIP branch for the 18.1 series
158 staging/18.2 - WIP branch for the 18.2 series
162 - People are encouraged to test the staging branch and report
164 - The branch history is not stable and it **will** be rebased,
167 --------------------
175 testing is done and there are little to-no issues. Ideally all of those
180 .. code-block:: sh
184 git commit -asm 'VERSION: bump to X.(Y+1)'
185 truncate -s0 docs/relnotes/new_features.txt
186 git commit -asm 'docs: reset new_features.txt'
190 to ``@Marge-bot``. Keep an eye on it, as you'll need to wait for it to
197 .. code-block:: sh
201 git tag -s $VERSION-branchpoint -m "Mesa $VERSION branchpoint" $LAST_COMMIT
203 # Double-check that you tagged the correct commit
204 git show $VERSION-branchpoint
209 .. code-block:: sh
211 git push origin $VERSION-branchpoint
212 git checkout $VERSION-branchpoint
223 .. code-block:: sh
225 git rebase -i mesa-$(cat VERSION)
228 `GitLab <https://gitlab.freedesktop.org/mesa/mesa/-/milestones>`__ and
233 extremely rarely - we had only one case so far (see commit
237 --------------------
244 Ensure the latest code is available - both in your local main and the
251 :ref:`cherry-pick <pickntest>` So we do a quick 'touch test'
253 - meson dist
254 - the produced binaries work
258 .. code-block:: sh
260 __glxgears_cmd='glxgears 2>&1 | grep -v "configuration file"'
262 __es2gears_cmd='es2gears_x11 2>&1 | grep -v "configuration file"'
288 steam steam://rungameid/570 -vconsole -vulkan
299 Increment the version contained in the file ``VERSION`` at Mesa's top-level,
303 Use the release.sh script from X.Org `util-modular <https://gitlab.freedesktop.org/xorg/util/modula…
308 .. code-block:: sh
310 ../relative/path/to/release.sh . # append --dist if you've already done distcheck above
317 release notes, and is published in `release-maintainers-keys.asc
318 <release-maintainers-keys.asc>`__.
325 in the ``mesa-X.Y.Z.announce`` template. Commit this change.
330 .. code-block:: sh
341 .. code-block:: sh
343 git cherry-pick -x X.Y~1
344 git cherry-pick -x X.Y
348 .. code-block:: sh
353 docs/relnotes.rst and docs/release-calendar.csv. It will then generate
357 .. code-block:: sh
362 --------------------
370 --------------------