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

[CI] Use fixed addrbook in state compatibility check (backport #2964) #3026

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 17, 2022

This is an automatic backport of pull request #2964 done by Mergify.
Cherry-pick of 818babf has failed:

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

You are currently cherry-picking commit 818babfe.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/state-compatibility-check.yml

no changes added to commit (use "git add" and/or "git commit -a")

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

(cherry picked from commit 818babf)

# Conflicts:
#	.github/workflows/state-compatibility-check.yml
@codecov-commenter
Copy link

Codecov Report

Merging #3026 (4aba40b) into v7.x (e30c625) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v7.x    #3026   +/-   ##
=======================================
  Coverage   20.63%   20.63%           
=======================================
  Files         199      199           
  Lines       25810    25810           
=======================================
  Hits         5325     5325           
  Misses      19516    19516           
  Partials      969      969           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@mattverse mattverse added the V:state/compatible/backport State machine compatible PR, should be backported label Oct 19, 2022
@niccoloraspa
Copy link
Member

We can close this PR.
No need to backport to v7.

@mergify mergify bot deleted the mergify/bp/v7.x/pr-2964 branch October 24, 2022 09:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts V:state/compatible/backport State machine compatible PR, should be backported
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants