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

server: fix interceptConfigs (bp #8641) #8659

Merged
merged 3 commits into from
Feb 22, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2021

This is an automatic backport of pull request #8641 done by Mergify.

Cherry-pick of 2f069c9 has failed:

On branch mergify/bp/release/v0.41.x/pr-8641
Your branch is up to date with 'origin/release/v0.41.x'.

You are currently cherry-picking commit 2f069c90b.
  (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:   server/util_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   server/util.go

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

* server: fix interceptConfigs

* cl++

* revert call

* update error message

* revise TestInterceptConfigsPreRunHandlerDoesNotMixConfigFiles

* remove TestInterceptConfigsPreRunHandlerDoesNotMixConfigFiles

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 2f069c9)

# Conflicts:
#	CHANGELOG.md
#	server/util.go
@codecov
Copy link

codecov bot commented Feb 22, 2021

Codecov Report

Merging #8659 (7a6628c) into release/v0.41.x (2a5818c) will decrease coverage by 0.00%.
The diff coverage is 41.09%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##           release/v0.41.x    #8659      +/-   ##
===================================================
- Coverage            61.93%   61.92%   -0.01%     
===================================================
  Files                  611      611              
  Lines                35250    35246       -4     
===================================================
- Hits                 21831    21827       -4     
  Misses               11136    11136              
  Partials              2283     2283              
Impacted Files Coverage Δ
baseapp/grpcserver.go 2.70% <0.00%> (+0.13%) ⬆️
store/rootmulti/store.go 66.05% <0.00%> (ø)
testutil/network/network.go 90.54% <0.00%> (ø)
x/staking/keeper/keeper.go 56.66% <ø> (-1.40%) ⬇️
x/staking/keeper/validator.go 80.52% <ø> (+0.03%) ⬆️
client/grpc_query.go 29.16% <40.00%> (+0.90%) ⬆️
baseapp/grpcrouter.go 80.00% <50.00%> (-6.05%) ⬇️
codec/types/any.go 64.00% <100.00%> (+3.13%) ⬆️
crypto/hd/hdpath.go 98.49% <100.00%> (+0.03%) ⬆️
server/grpc/server.go 62.50% <100.00%> (ø)
... and 4 more

@lgtm-com
Copy link

lgtm-com bot commented Feb 22, 2021

This pull request introduces 9 alerts when merging a696436 into 128cb54 - view on LGTM.com

new alerts:

  • 5 for Expression has no effect
  • 4 for Unreachable statement

@@ -44,7 +44,16 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Improvements
Copy link
Contributor

Choose a reason for hiding this comment

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

@alessio there is no pending section in this file for the next 0.41 release. Where do these entries go?

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah I'm about to open a PR for that

Copy link
Contributor

Choose a reason for hiding this comment

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

@alexanderbez for now just don't add an entry. I think it's much easier to prep and finalize both changelog and release notes at release time. So we do the work only once. Wdyt?

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree. But the changelog entries need to be tracked somewhere, right? How does the release manager know what to add?

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

All merged PRs must be included in the release milestone

@alessio alessio merged commit 02aa30e into release/v0.41.x Feb 22, 2021
@alessio alessio deleted the mergify/bp/release/v0.41.x/pr-8641 branch February 22, 2021 14:59
@alessio alessio added this to the v0.41.4 milestone Feb 22, 2021
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.

2 participants