Skip to content

update backport instructions for 2.20 #3166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

update backport instructions for 2.20 #3166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docs/docsite/rst/community/development_process.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ We do **not** backport features.

These instructions assume that:

* ``stable-2.19`` is the targeted release branch for the backport
* ``stable-2.20`` is the targeted release branch for the backport
* ``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.
* ``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.

Expand All @@ -247,7 +247,7 @@ We do **not** backport features.
.. code-block:: shell

git fetch upstream
git checkout -b backport/2.19/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.19
git checkout -b backport/2.20/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.20

#. Cherry pick the relevant commit SHA from the devel branch into your feature branch, handling merge conflicts as necessary:

Expand All @@ -261,15 +261,15 @@ We do **not** backport features.

.. code-block:: shell

git push origin backport/2.19/[PR_NUMBER_FROM_DEVEL]
git push origin backport/2.20/[PR_NUMBER_FROM_DEVEL]

#. Submit the pull request for ``backport/2.19/[PR_NUMBER_FROM_DEVEL]`` against the ``stable-2.19`` branch
#. Submit the pull request for ``backport/2.20/[PR_NUMBER_FROM_DEVEL]`` against the ``stable-2.20`` branch

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

.. note::

The branch name ``backport/2.19/[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.
The branch name ``backport/2.20/[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.

.. note::

Expand Down