Skip to content

Commit

Permalink
Merge branch 'main' into 8.5.x-increment-proposer
Browse files Browse the repository at this point in the history
  • Loading branch information
sainoe committed Oct 14, 2024
2 parents 23d9281 + 0f4b8dd commit 233ff1f
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
queue_rules:
- name: default
conditions:
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
merge_conditions:
- "#approved-reviews-by>=1"
- base=main
- label=automerge
Expand All @@ -14,10 +17,7 @@ pull_request_rules:
actions:
queue:
name: default
method: squash
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
merge_method: squash
- name: backport patches to v0.1.x callbacks ibc-go v7.3.x branch
conditions:
- base=main
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/proto-breaking-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: proto breaking check
# proto breaking check workflow checks if Protobuf file contains breaking changes.
# This workflow runs when a PR that targets Protobuf is opened.
on:
merge_group:
pull_request:
paths:
- "proto/**/*.proto"

jobs:
proto-breaking-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Run proto-breaking check
run: make proto-check-breaking
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ run:
linters:
disable-all: true
enable:
- exportloopref
- copyloopvar
- errcheck
- gci
- goconst
Expand Down

0 comments on commit 233ff1f

Please sign in to comment.