Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

ci: enable backport for v0.8 and v0.7 #784

Merged
merged 2 commits into from
Nov 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
File renamed without changes.
26 changes: 25 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down