Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

merkle-tree: fix build when targeting bpf (bp #16335) #16342

Merged
merged 3 commits into from
Apr 5, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 3, 2021

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

Cherry-pick of ddc0a16 has failed:

On branch mergify/bp/v1.6/pr-16335
Your branch is ahead of 'origin/v1.6' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ddc0a16ce.
  (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:   Cargo.lock
	modified:   merkle-tree/src/merkle_tree.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   merkle-tree/Cargo.toml

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/

@mergify mergify bot added the conflicts label Apr 3, 2021
(cherry picked from commit a1d9b53)
@t-nelson t-nelson force-pushed the mergify/bp/v1.6/pr-16335 branch from 321a1fe to 141f1b2 Compare April 5, 2021 19:18
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 5, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 5, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 5, 2021
@t-nelson t-nelson force-pushed the mergify/bp/v1.6/pr-16335 branch from 141f1b2 to de9326b Compare April 5, 2021 19:29
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Apr 5, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 5, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 5, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 5, 2021

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Apr 5, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 5, 2021

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Apr 5, 2021
@codecov
Copy link

codecov bot commented Apr 5, 2021

Codecov Report

Merging #16342 (de9326b) into v1.6 (6184254) will increase coverage by 0.0%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v1.6   #16342   +/-   ##
=======================================
  Coverage    80.0%    80.1%           
=======================================
  Files         410      410           
  Lines      109413   109413           
=======================================
+ Hits        87625    87647   +22     
+ Misses      21788    21766   -22     

@mergify mergify bot merged commit f2f4f28 into v1.6 Apr 5, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-16335 branch April 5, 2021 21:57
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant