From b742e596b815c6f2c7f9d71f0f4c92d80ae6b3fe Mon Sep 17 00:00:00 2001 From: lg Date: Tue, 23 May 2023 13:18:48 +0200 Subject: [PATCH 1/2] Update mergify config with rules for feature branch --- .mergify.yml | 12 +++++++++++- contrib/generate_release_note/main.go | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 5ff7b8d56ab..894a113e9a0 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -50,4 +50,14 @@ pull_request_rules: actions: backport: branches: - - release/v10.0.x \ No newline at end of file + - release/v10.0.x + + - name: Feature branch for SDK v0.47 & IBC v7 upgrade + conditions: + - "#approved-reviews-by>=1" + - base=main + - label=A:backport/sdk-47-ibc-7 + actions: + backport: + branches: + - feat/sdk-47-ibc-7 \ No newline at end of file diff --git a/contrib/generate_release_note/main.go b/contrib/generate_release_note/main.go index e241f99d75f..6bcdfedf67c 100644 --- a/contrib/generate_release_note/main.go +++ b/contrib/generate_release_note/main.go @@ -30,7 +30,7 @@ func main() { } note := strings.Builder{} - note.WriteString(fmt.Sprintf("#Gaia %s Release Notes\n", args[1])) + note.WriteString(fmt.Sprintf("# Gaia %s Release Notes\n", args[1])) note.WriteString(changelog) note.WriteString("```\n") note.Write(buildReport) From bad6dd55608194a9e2a0645efec14531d249ace3 Mon Sep 17 00:00:00 2001 From: MSalopek Date: Wed, 24 May 2023 11:16:14 +0200 Subject: [PATCH 2/2] chore: rm extra .mergify rule --- .mergify.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 894a113e9a0..28c0186619d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -51,13 +51,3 @@ pull_request_rules: backport: branches: - release/v10.0.x - - - name: Feature branch for SDK v0.47 & IBC v7 upgrade - conditions: - - "#approved-reviews-by>=1" - - base=main - - label=A:backport/sdk-47-ibc-7 - actions: - backport: - branches: - - feat/sdk-47-ibc-7 \ No newline at end of file