diff --git a/.mergify.yml b/.mergify.yml index 8941711a9..f49144113 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -150,3 +150,14 @@ pull_request_rules: labels: - automatic backport - merge-queue + + - name: backport patches to 2.30 + conditions: + - label=backport 2.30-maintenance + actions: + backport: + branches: + - "2.30-maintenance" + labels: + - automatic backport + - merge-queue diff --git a/.version b/.version index 6a6900382..bafceb320 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.30.0 +2.31.0 diff --git a/maintainers/release-process.md b/maintainers/release-process.md index f2c61302b..37b38fb9f 100644 --- a/maintainers/release-process.md +++ b/maintainers/release-process.md @@ -39,10 +39,6 @@ release: * Proof-read / edit / rearrange the release notes if needed. Breaking changes and highlights should go to the top. -* Run `maintainers/release-credits` to make sure the credits script works - and produces a sensible output. Some emails might not automatically map to - a GitHub handle. - * Push. ```console