Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 25, 2024

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

On branch mergify/bp/v1.x/pr-2049
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit e9637adbe.
  (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:   CONTRIBUTING.md
	modified:   rpc/jsonrpc/client/integration_test.go
	new file:   scripts/gofumpt.sh
	modified:   test/e2e/pkg/grammar/clean-start/grammar-auto/lexer/lexer.go
	modified:   test/e2e/pkg/grammar/clean-start/grammar-auto/token/token.go
	modified:   test/e2e/pkg/grammar/recovery/grammar-auto/sppf/sppf.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/lint.yml
	both modified:   Makefile
	both modified:   test/e2e/pkg/grammar/clean-start/grammar-auto/parser/slot/slot.go
	both modified:   test/e2e/pkg/grammar/clean-start/grammar-auto/parser/symbols/symbols.go
	both modified:   test/e2e/pkg/grammar/recovery/grammar-auto/parser/bsr/bsr.go

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

Our codebase is already sufficiently formatted, so we can enable
**`gofumpt` by default**.

This PR also merges `lint-typo`, `lint-fix-typo`, `format`,
`lint-format`, and `lint` Makefile
targets into a single `lint` target to ease the software development
process. `codespell` CI job is removed in favor of `lint` job.

Closes #604

---------

Co-authored-by: Greg Szabo <16846635+greg-szabo@users.noreply.github.com>
(cherry picked from commit e9637ad)

# Conflicts:
#	.github/workflows/lint.yml
#	Makefile
#	test/e2e/pkg/grammar/clean-start/grammar-auto/parser/slot/slot.go
#	test/e2e/pkg/grammar/clean-start/grammar-auto/parser/symbols/symbols.go
#	test/e2e/pkg/grammar/recovery/grammar-auto/parser/bsr/bsr.go
@mergify mergify bot requested a review from a team as a code owner January 25, 2024 14:02
@mergify mergify bot requested a review from a team January 25, 2024 14:02
@mergify mergify bot added the conflicts label Jan 25, 2024
* add GH workflow for linting code using codespell

Port of osmosis-labs/osmosis#7088

* fix linting errors
@mergify mergify bot requested a review from a team as a code owner January 25, 2024 14:51
@melekes melekes merged commit d3d3386 into v1.x Jan 25, 2024
@melekes melekes deleted the mergify/bp/v1.x/pr-2049 branch January 25, 2024 14:58
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