From 7ab85463097fe0d3e572f829f59b1819b339f698 Mon Sep 17 00:00:00 2001 From: Roman Date: Fri, 21 Oct 2022 19:47:45 -0400 Subject: [PATCH 1/2] ci(CL): run tests on CL branch and add backport config --- .github/mergify.yml | 8 ++++++++ .github/workflows/lint.yml | 1 + .github/workflows/test.yml | 1 + 3 files changed, 10 insertions(+) diff --git a/.github/mergify.yml b/.github/mergify.yml index 818cb1198ad..8e0dcf4cbae 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -110,3 +110,11 @@ pull_request_rules: backport: branches: - v13.x + - name: backport patches to concentrated-liquidity-main + conditions: + - base=main + - label=A:backport/concenntrated-liquidity-main + actions: + backport: + branches: + - concentrated-liquidity-main diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c468161ab64..4baa5ff168e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - concentrated-liquidity-main jobs: golangci: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b5ade8be72a..cfbcdf553db 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,6 +7,7 @@ on: push: branches: - "main" + - "concentrated-liquidity-main" - "v[0-9]**" workflow_dispatch: From a50dd120fbaaa31dfa799d93ea11f5576be145af Mon Sep 17 00:00:00 2001 From: Roman Date: Fri, 21 Oct 2022 19:49:20 -0400 Subject: [PATCH 2/2] Update .github/mergify.yml --- .github/mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 8e0dcf4cbae..e798e301429 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -113,7 +113,7 @@ pull_request_rules: - name: backport patches to concentrated-liquidity-main conditions: - base=main - - label=A:backport/concenntrated-liquidity-main + - label=A:backport/concentrated-liquidity-main actions: backport: branches: