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

merge-queue: embarking main (c24ea1f) and #3643 together #3656

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 25, 2022

🎉 This combination of pull requests has been checked successfully 🎉

Branch main (c24ea1f) and #3643 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #3643.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue urgent for merge:

  • any of:
    • check-success=Clippy
    • check-neutral=Clippy
    • check-skipped=Clippy
  • any of:
    • check-success=Rustfmt
    • check-neutral=Rustfmt
    • check-skipped=Rustfmt
  • any of:
    • check-success=Test with fake activation heights
    • check-neutral=Test with fake activation heights
    • check-skipped=Test with fake activation heights
  • any of:
    • check-success=Test full validation sync from cached state
    • check-neutral=Test full validation sync from cached state
    • check-skipped=Test full validation sync from cached state
  • any of:
    • check-success=Test stable on macOS-latest
    • check-neutral=Test stable on macOS-latest
    • check-skipped=Test stable on macOS-latest
  • any of:
    • check-success=Test stable on ubuntu-latest
    • check-neutral=Test stable on ubuntu-latest
    • check-skipped=Test stable on ubuntu-latest
  • any of:
    • check-success=Test stable on windows-latest
    • check-neutral=Test stable on windows-latest
    • check-skipped=Test stable on windows-latest
  • any of:
    • check-success=Test all
    • check-neutral=Test all
    • check-skipped=Test all
  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • #review-threads-unresolved=0 [🛡 GitHub branch protection]
  • check-success=Test all
  • check-success=Test with fake activation heights
  • check-success=Test full validation sync from cached state
  • check-success=Test stable zebra-state with fake activation heights on ubuntu-latest
  • check-success=Test stable on ubuntu-latest
  • check-success=Test stable on macOS-latest
  • check-success=Test stable on windows-latest
  • check-success=Coverage nightly
  • check-success=Clippy
  • check-success=Rustfmt

More informations about Mergify merge queue can be found in the documentation.

Mergify commands

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

  • @Mergifyio refresh will re-evaluate the queue rules

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

teor2345 and others added 2 commits February 25, 2022 14:56
The mempool is only activated once, so we must check for that log first.
After mempool activation, the stop regex is logged at least once.
(It might be logged before as well, but we can't rely on that.)

When checking that the mempool didn't activate,
wait for the `zebrad` command to exit,
then check the entire log.
@codecov
Copy link

codecov bot commented Feb 25, 2022

Codecov Report

Merging #3656 (bb06470) into main (c24ea1f) will increase coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #3656      +/-   ##
==========================================
+ Coverage   80.03%   80.04%   +0.01%     
==========================================
  Files         284      284              
  Lines       32740    32740              
==========================================
+ Hits        26202    26206       +4     
+ Misses       6538     6534       -4     

@mergify
Copy link
Contributor Author

mergify bot commented Feb 25, 2022

The pull request #3643 is mergeable

@mergify mergify bot closed this Feb 25, 2022
@mergify mergify bot deleted the mergify/merge-queue/main/3643 branch February 25, 2022 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant