Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: re-enable make proto-check and update proto options (backport #1060) #1067

Merged
merged 2 commits into from
Jun 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 22, 2023

This is an automatic backport of pull request #1060 done by Mergify.
Cherry-pick of acc494f has failed:

On branch mergify/bp/release/v3.0.x/pr-1060
Your branch is up to date with 'origin/release/v3.0.x'.

You are currently cherry-picking commit acc494f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Makefile
	modified:   proto/interchain_security/ccv/consumer/v1/consumer.proto
	modified:   proto/interchain_security/ccv/consumer/v1/genesis.proto
	modified:   proto/interchain_security/ccv/consumer/v1/query.proto
	modified:   proto/interchain_security/ccv/provider/v1/genesis.proto
	modified:   proto/interchain_security/ccv/provider/v1/provider.proto
	modified:   proto/interchain_security/ccv/provider/v1/query.proto
	modified:   proto/interchain_security/ccv/provider/v1/tx.proto
	modified:   proto/interchain_security/ccv/v1/ccv.proto
	modified:   scripts/protocgen.sh
	modified:   x/ccv/consumer/types/consumer.pb.go
	modified:   x/ccv/consumer/types/genesis.pb.go
	modified:   x/ccv/consumer/types/query.pb.go
	modified:   x/ccv/provider/types/genesis.pb.go
	modified:   x/ccv/provider/types/provider.pb.go
	modified:   x/ccv/provider/types/query.pb.go
	modified:   x/ccv/provider/types/tx.pb.go
	modified:   x/ccv/types/ccv.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/automated-tests.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* fix: update proto build tooling

* fix: re-enable make proto-check in CI

* chore: proto check that works (#1063)

* wip

* works

* comments

---------

Co-authored-by: Shawn <[email protected]>
(cherry picked from commit acc494f)

# Conflicts:
#	.github/workflows/automated-tests.yml
@mergify mergify bot requested a review from a team as a code owner June 22, 2023 11:23
@mergify mergify bot added the conflicts label Jun 22, 2023
@MSalopek MSalopek merged commit 4376d15 into release/v3.0.x Jun 22, 2023
@MSalopek MSalopek deleted the mergify/bp/release/v3.0.x/pr-1060 branch June 22, 2023 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant