Skip to content

Commit

Permalink
Merge branch 'main' into julien/nits
Browse files Browse the repository at this point in the history
  • Loading branch information
julienrbrt authored Nov 22, 2024
2 parents 8aa4042 + 4eaa0d6 commit aa4d6fb
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
24 changes: 12 additions & 12 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
queue_rules:
- name: default
conditions:
queue_conditions:
- "#approved-reviews-by>1"
- base=main
merge_conditions:
- "#approved-reviews-by>1"
merge_method: squash
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
pull_request_rules:
- name: automerge to main with label automerge and branch protection passing
conditions:
- "#approved-reviews-by>1"
- base=main
actions:
queue:
name: default
method: squash
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
- name: backport patches to v28.x.y branch
conditions:
- base=main
Expand All @@ -31,3 +27,7 @@ pull_request_rules:
backport:
branches:
- release/v29.x.y
- name: refactored queue action rule
conditions: []
actions:
queue:
6 changes: 3 additions & 3 deletions docs/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3273,9 +3273,9 @@ cross-fetch@^3.1.5:
node-fetch "2.6.7"

cross-spawn@^7.0.3:
version "7.0.3"
resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
version "7.0.6"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
dependencies:
path-key "^3.1.0"
shebang-command "^2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ replace (

require (
cosmossdk.io/core v1.0.0
cosmossdk.io/math v1.3.0
cosmossdk.io/math v1.4.0
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000
github.com/99designs/keyring v1.2.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U=
cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM=
cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU=
cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ=
cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk=
cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9 h1:DmOoS/1PeY6Ih0hAVlJ69kLMUrLV+TCbfICrZtB1vdU=
cosmossdk.io/schema v0.3.1-0.20240930054013-7c6e0388a3f9/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
cosmossdk.io/store v1.0.0-rc.0.0.20241106232657-2290c5ee5582 h1:PVMvSrFMaMNy9fJ1D/bvCSS8DepswqJI/VoMuYDeYdA=
Expand Down
2 changes: 1 addition & 1 deletion ignite/templates/app/files/go.mod.plush
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ require (
cosmossdk.io/depinject v1.0.0
cosmossdk.io/errors v1.0.1
cosmossdk.io/log v1.4.1
cosmossdk.io/math v1.3.0
cosmossdk.io/math v1.4.0
cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6
cosmossdk.io/tools/confix v0.1.2
cosmossdk.io/x/accounts v0.0.0-20240913065641-0064ccbce64e
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func SimulateMsgDelete<%= TypeName.UpperCamel %>(
var (
simAccount = simtypes.Account{}
<%= TypeName.LowerCamel %> = types.<%= TypeName.UpperCamel %>{}
msg = &types.MsgUpdate<%= TypeName.UpperCamel %>{}
msg = &types.MsgDelete<%= TypeName.UpperCamel %>{}
found = false
)

Expand Down

0 comments on commit aa4d6fb

Please sign in to comment.