From 16db5cabb5200b0cc873dd6fa16d96c7b6a99fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Federico=20Kunze=20K=C3=BCllmer?=
 <31522760+fedekunze@users.noreply.github.com>
Date: Thu, 25 Nov 2021 12:06:30 +0100
Subject: [PATCH] ci: enable backport for v0.8 and v0.7 (#784)

* ci: enable backport for v0.8 and v0.7

* changelog
---
 clang-format => .clang-format |  0
 .mergify.yml                  | 26 +++++++++++++++++++++++++-
 CHANGELOG.md                  |  4 ++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 rename clang-format => .clang-format (100%)

diff --git a/clang-format b/.clang-format
similarity index 100%
rename from clang-format
rename to .clang-format
diff --git a/.mergify.yml b/.mergify.yml
index 69eb476c..30bf50e8 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,10 +1,34 @@
+queue_rules:
+  - name: default
+    conditions:
+      - "#approved-reviews-by>1"
+
 pull_request_rules:
-  - name: automerge to base branch with label automerge and branch protection passing
+  - name: automerge to the base branch with label automerge and branch protection passing
     conditions:
       - "#approved-reviews-by>1"
       - base=main
       - label=automerge
     actions:
+      queue:
+        name: default
       merge:
         method: squash
         strict: true
+        commit_message: title+body
+  - name: backport patches to v0.8.x branch
+    conditions:
+      - base=main
+      - label=backport/0.8.x
+    actions:
+      backport:
+        branches:
+          - release/v0.8.x
+  - name: backport patches to v0.7.x branch
+    conditions:
+      - base=main
+      - label=backport/0.7.x
+    actions:
+      backport:
+        branches:
+          - release/v0.7.x
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3442be09..144c10d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## Unreleased
 
+## Improvements
+
+* (ci) [tharsis#784](https://github.com/tharsis/ethermint/pull/784) Enable automatic backport of PRs.
+
 ### Bug Fixes
 
 * (feemarket) [tharsis#770](https://github.com/tharsis/ethermint/pull/770) Enable fee market (EIP1559) by default.