From cc4a9ebc455fdf779ff96a9da55e32b26371f712 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 00:52:55 +0000
Subject: [PATCH] Update Readme + Mergify Rule for Maintained Branches (#647)
(#649)
* readme maintained branches
* update mergify rule
* update dependabot labels
(cherry picked from commit 2c0c5ecf001dc62333edb16049c4fc71e97a1444)
Co-authored-by: Dan Kanefsky <56059752+boojamya@users.noreply.github.com>
---
.github/dependabot.yml | 6 ++----
.github/mergify.yml | 10 +++++-----
README.md | 17 +++++++++--------
3 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a82fcce36..e3e71018f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -11,13 +11,11 @@ updates:
interval: "weekly"
open-pull-requests-limit: 10
labels:
- - dependencies
- - dont_backport
-
+ - dependencies
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: monthly
open-pull-requests-limit: 10
labels:
- - dont_backport
\ No newline at end of file
+ - gh-action-version
\ No newline at end of file
diff --git a/.github/mergify.yml b/.github/mergify.yml
index b0ac18998..3fa1777a4 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,13 +1,13 @@
pull_request_rules:
- name: backport to maintained branches
conditions:
- - base=main
- - label!=dont_backport
+ - base~=^(main|v4|v4-ics|v5|v6)$
+ - label=BACKPORT
actions:
backport:
branches:
- - v3
- - v3-ics
+ - main
+ - v4-ics
- v4
- v5
- v6
@@ -21,7 +21,7 @@ pull_request_rules:
- name: automerge backported PR's for maintained branches
conditions:
- label=automerge
- - base~=^(v3|v3-ics|v4|v5|v6)$
+ - base~=^(v4|v4-ics|v5|v6)$
actions:
merge:
method: squash
\ No newline at end of file
diff --git a/README.md b/README.md
index d1d5a7c69..411e03da9 100644
--- a/README.md
+++ b/README.md
@@ -25,14 +25,15 @@ It allows users to quickly spin up custom testnets and dev environments to test
### Maintained Branches
-| **Branch Name** | **IBC-Go** | **Cosmos-sdk** |
-|:----------------------------------------------------------------------------:|:----------:|:--------------:|
-| main | v7 | v0.47 |
-| [v6](https://github.com/strangelove-ventures/interchaintest/tree/v6) | v6 | v0.46 |
-| [v5](https://github.com/strangelove-ventures/interchaintest/tree/v5) | v5 | v0.46 |
-| [v4](https://github.com/strangelove-ventures/interchaintest/tree/v4) | v4 | v0.45 |
-| [v3](https://github.com/strangelove-ventures/interchaintest/tree/v3) | v3 | v0.45 |
-| [v3-ics](https://github.com/strangelove-ventures/interchaintest/tree/v3-ics) | v3 | v0.45.11-ics |
+| **Branch Name** | **IBC-Go** | **Cosmos-sdk** | **Maintained** |
+|:----------------------------------------------------------------------------:|:----------:|:--------------:|:-------------------:|
+| main | v7 | v0.47 | ✅ |
+| [v6](https://github.com/strangelove-ventures/interchaintest/tree/v6) | v6 | v0.46 | ✅ |
+| [v5](https://github.com/strangelove-ventures/interchaintest/tree/v5) | v5 | v0.46 | ✅ |
+| [v4](https://github.com/strangelove-ventures/interchaintest/tree/v4) | v4 | v0.45 | ✅ |
+| [v4-ics](https://github.com/strangelove-ventures/interchaintest/tree/v4-ics) | v4 | v0.45.x-ics | ✅ |
+| [v3](https://github.com/strangelove-ventures/interchaintest/tree/v3) | v3 | v0.45 |❌
(June 25 2023) |
+| [v3-ics](https://github.com/strangelove-ventures/interchaintest/tree/v3-ics) | v3 | v0.45.11-ics |❌
(April 24 2023)|
## Table Of Contents
- [Building Binary](#building-binary)