From e96fd1735d92f1a7672a6435dc33032aeeb7bf61 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 15:47:47 -0700 Subject: [PATCH] update deps and add mergify config for v0.26.x release branch (backport #1853) (#1854) * update deps and add mergify config for v0.26.x release branch (#1853) (cherry picked from commit 7866ee2f74ef4e5cb9e2eb11f6d882f99724bd69) # Conflicts: # go.sum * fix go.sum conflicts --------- Co-authored-by: Nick DeLuca --- .github/mergify.yml | 10 ++++++++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index cb73f169..ae0329af 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -26,6 +26,7 @@ pull_request_rules: - release/v0.23.x - release/v0.24.x - release/v0.25.x + - release/v0.26.x - name: Backport patches to the release/v0.17.x branch conditions: @@ -89,3 +90,12 @@ pull_request_rules: backport: branches: - release/v0.25.x + + - name: Backport patches to the release/v0.26.x branch + conditions: + - base=master + - label=A:backport/v0.26.x + actions: + backport: + branches: + - release/v0.26.x diff --git a/go.mod b/go.mod index 80f7c886..46622162 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.7 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2 + github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3 github.com/cosmos/ibc-go/v7 v7.3.1 github.com/ethereum/go-ethereum v1.10.26 github.com/evmos/ethermint v0.21.0 diff --git a/go.sum b/go.sum index cf0fcc88..1b3f316c 100644 --- a/go.sum +++ b/go.sum @@ -424,8 +424,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v1.0.0 h1:bw6t0Mv/mVCJvlMTOPHWLs5uUE3BRBfVWCRelOzl+so= github.com/cosmos/iavl v1.0.0/go.mod h1:CmTGqMnRnucjxbjduneZXT+0vPgNElYvdefjX2q9tYc= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2 h1:6zjj+yIpMbCTRI2eJ2fXuflElENs3mrUSLH/TSWL8fk= -github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.2/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3 h1:MZGDMETv72suFpTAD6VPGqSIm1FJcChtk2HmVh9D+Bo= +github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s= github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=