diff --git a/.github/mergify.yml b/.github/mergify.yml index 7c05eca9..9c4d2621 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -2,14 +2,13 @@ pull_request_rules: - name: backport to maintained branches conditions: - - base~=^(main|release/v4|release/v5|release/v6)$ + - base~=^(main|release/v7|release/v6)$ - label=BACKPORT actions: backport: branches: - main - - release/v4 - - release/v5 + - release/v7 - release/v6 assignees: - "{{ author }}" @@ -21,7 +20,7 @@ pull_request_rules: - name: automerge backported PR's for maintained branches conditions: - label=automerge - - base~=^(release/v4|release/v5|release/v6)$ + - base~=^(release/v6|release/v7)$ actions: merge: method: squash \ No newline at end of file diff --git a/README.md b/README.md index 2d81b60e..bdf32e51 100644 --- a/README.md +++ b/README.md @@ -61,8 +61,7 @@ An [example IBC app](./examples/hello-world/) |:----------------------------------------------------------------:|:----------:| | [main](https://github.com/cosmos/ibc-apps) | v7 | | [release/v6](https://github.com/cosmos/ibc-apps/tree/release/v6) | v6 | -| [release/v5](https://github.com/cosmos/ibc-apps/tree/release/v5) | v5 | -| [release/v4](https://github.com/cosmos/ibc-apps/tree/release/v4) | v4 | + ## List of Apps