diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contributing/submitting-changes.chapter.md | 16 | ||||
| -rw-r--r-- | doc/languages-frameworks/go.section.md | 2 | ||||
| -rw-r--r-- | doc/languages-frameworks/python.section.md | 3 |
3 files changed, 15 insertions, 6 deletions
diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index ca3532ea83d..09ffba3dc6f 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -246,11 +246,21 @@ If the branch is already in a broken state, please refrain from adding extra new ### Stable release branches {#submitting-changes-stable-release-branches} -For cherry-picking a commit to a stable release branch (“backporting”), use `git cherry-pick -x <original commit>` so that the original commit id is included in the commit. +The same staging workflow applies to stable release branches, but the main branch is called `release-*` instead of `master`. -Add a reason for the backport by using `git cherry-pick -xe <original commit>` instead when it is not obvious from the original commit message. It is not needed when it's a minor version update that includes security and bug fixes but don't add new features or when the commit fixes an otherwise broken package. +Example branch names: `release-21.11`, `staging-21.11`, `staging-next-21.11`. -For backporting Pull Requests to stable branches, assign label `backport <branch>` to the original Pull Requests and automation should take care of the rest once the Pull Requests is merged. +Most changes added to the stable release branches are cherry-picked (“backported”) from the `master` and staging branches. + +#### Automatically backporting a Pull Request {#submitting-changes-stable-release-branches-automatic-backports} + +Assign label `backport <branch>` (e.g. `backport release-21.11`) to the PR and a backport PR is automatically created after the PR is merged. + +#### Manually backporting changes {#submitting-changes-stable-release-branches-manual-backports} + +Cherry-pick changes via `git cherry-pick -x <original commit>` so that the original commit id is included in the commit message. + +Add a reason for the backport when it is not obvious from the original commit message. You can do this by cherry picking with `git cherry-pick -xe <original commit>`, which allows editing the commit message. This is not needed for minor version updates that include security and bug fixes but don't add new features or when the commit fixes an otherwise broken package. Here is an example of a cherry-picked commit message with good reason description: diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 45d85f1f99e..7cbf51c8e37 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -29,8 +29,6 @@ pet = buildGoModule rec { vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; - runVend = true; - meta = with lib; { description = "Simple command-line snippet manager, written in Go"; homepage = "https://github.com/knqyf263/pet"; diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 4d70409a20c..9f9ace513c3 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -764,7 +764,7 @@ and in this case the `python38` interpreter is automatically used. ### Interpreters {#interpreters} -Versions 2.7, 3.6, 3.7, 3.8 and 3.9 of the CPython interpreter are available as +Versions 2.7, 3.7, 3.8 and 3.9 of the CPython interpreter are available as respectively `python27`, `python37`, `python38` and `python39`. The aliases `python2` and `python3` correspond to respectively `python27` and `python39`. The attribute `python` maps to `python2`. The PyPy interpreters @@ -834,6 +834,7 @@ sets are * `pkgs.python38Packages` * `pkgs.python39Packages` * `pkgs.python310Packages` +* `pkgs.python311Packages` * `pkgs.pypyPackages` and the aliases |