Skip to content

Commit aff3a84

Browse files
authored
update backport instructions (#2183)
1 parent fd2c82a commit aff3a84

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

docs/docsite/rst/community/development_process.rst

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ If you want to follow the conversation about what features will be added to ``an
2121
* the :ref:`roadmaps`
2222
* the :ref:`Ansible Release Schedule <release_and_maintenance>`
2323
* the :ref:`ansible-core project branches and tags <core_branches_and_tags>`
24-
* various GitHub `projects <https://github.com/ansible/ansible/projects>`_ - for example:
25-
26-
* the `2.17 release project <https://github.com/ansible/ansible/projects/48>`_
27-
* the `core documentation project <https://github.com/orgs/ansible/projects/94/views/1>`_
24+
* the `2.19 release project <https://github.com/orgs/ansible/projects/140>`_
2825

2926

3027
.. _community_pull_requests:
@@ -206,7 +203,7 @@ Here are some examples:
206203
remote_src=True even if mode was not set as a parameter. This failed on
207204
filesystems which do not have permission bits (https://github.com/ansible/ansible/issues/29444).
208205
209-
You can find more example changelog fragments in the `changelog directory <https://github.com/ansible/ansible/tree/stable-2.17/changelogs/fragments>`_ for the 2.17 release.
206+
You can find more example changelog fragments in the `changelog directory <https://github.com/ansible/ansible/tree/stable-2.18/changelogs/fragments>`_ for the 2.18 release.
210207

211208
After you have written the changelog fragment for your PR, commit the file and include it with the pull request.
212209

@@ -241,7 +238,7 @@ We do **not** backport features.
241238

242239
These instructions assume that:
243240

244-
* ``stable-2.17`` is the targeted release branch for the backport
241+
* ``stable-2.18`` is the targeted release branch for the backport
245242
* ``https://github.com/ansible/ansible.git`` is configured as a ``git remote`` named ``upstream``. If you do not use a ``git remote`` named ``upstream``, adjust the instructions accordingly.
246243
* ``https://github.com/<yourgithubaccount>/ansible.git`` is configured as a ``git remote`` named ``origin``. If you do not use a ``git remote`` named ``origin``, adjust the instructions accordingly.
247244

@@ -250,7 +247,7 @@ We do **not** backport features.
250247
.. code-block:: shell
251248
252249
git fetch upstream
253-
git checkout -b backport/2.17/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.17
250+
git checkout -b backport/2.18/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.18
254251
255252
#. Cherry pick the relevant commit SHA from the devel branch into your feature branch, handling merge conflicts as necessary:
256253

@@ -264,15 +261,15 @@ We do **not** backport features.
264261

265262
.. code-block:: shell
266263
267-
git push origin backport/2.17/[PR_NUMBER_FROM_DEVEL]
264+
git push origin backport/2.18/[PR_NUMBER_FROM_DEVEL]
268265
269-
#. Submit the pull request for ``backport/2.17/[PR_NUMBER_FROM_DEVEL]`` against the ``stable-2.17`` branch
266+
#. Submit the pull request for ``backport/2.18/[PR_NUMBER_FROM_DEVEL]`` against the ``stable-2.18`` branch
270267

271268
#. The Release Manager will decide whether to merge the backport PR before the next minor release. There isn't any need to follow up. Just ensure that the automated tests (CI) are green.
272269

273270
.. note::
274271

275-
The branch name ``backport/2.17/[PR_NUMBER_FROM_DEVEL]`` is somewhat arbitrary but conveys meaning about the purpose of the branch. This branch name format is not required, but it can be helpful, especially when making multiple backport PRs for multiple stable branches.
272+
The branch name ``backport/2.18/[PR_NUMBER_FROM_DEVEL]`` is somewhat arbitrary but conveys meaning about the purpose of the branch. This branch name format is not required, but it can be helpful, especially when making multiple backport PRs for multiple stable branches.
276273

277274
.. note::
278275

0 commit comments

Comments
 (0)