Skip to content

v0.38.x: Fix linting (backport #1531) #1537

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Oct 26, 2023
Merged

v0.38.x: Fix linting (backport #1531) #1537

merged 2 commits into from
Oct 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 25, 2023

This is an automatic backport of pull request #1531 done by Mergify.
Cherry-pick of 822b277 has failed:

On branch mergify/bp/v0.38.x/pr-1531
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit 822b27767.
  (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:   .golangci.yml
	modified:   crypto/merkle/tree_test.go
	modified:   libs/protoio/io.go
	modified:   p2p/netaddress.go
	modified:   state/indexer/sink/psql/psql.go
	modified:   types/vote_set.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e/app/app.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

@sergio-mena @mergify
Fix linting on main (#1531)
7db4b77 
* Fix linting

* Addressed comments

* Remove nolint in `psql.go`

* state/indexer: override goconst lint in psql

Should probably use some smarter format strings

* Reverted some changes not needed

---------

Co-authored-by: Mikhail Zabaluev <mikhail@informal.systems>
(cherry picked from commit 822b277)

# Conflicts:
#	test/e2e/app/app.go
@mergify mergify bot requested a review from a team as a code owner October 25, 2023 10:14
@mergify mergify bot added the conflicts label Oct 25, 2023
@jmalicevic jmalicevic changed the title Fix linting on main (backport #1531) v0.38.x: Fix linting (backport #1531) Oct 25, 2023
sergio-mena
sergio-mena approved these changes Oct 25, 2023
View reviewed changes
Copy link
Contributor

@sergio-mena sergio-mena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked diff-of-diffs, LGTM

@jmalicevic jmalicevic self-assigned this Oct 26, 2023
@jmalicevic jmalicevic merged commit d599bed into v0.38.x Oct 26, 2023
@jmalicevic jmalicevic deleted the mergify/bp/v0.38.x/pr-1531 branch October 26, 2023 10:04
@faddat faddat mentioned this pull request Oct 15, 2024
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@sergio-mena sergio-mena sergio-mena approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@jmalicevic jmalicevic

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sergio-mena @jmalicevic