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

Fix cargo-build/test-bpf --workspace (bp #16431) #16432

Merged
merged 2 commits into from
Apr 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 8, 2021

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

Cherry-pick of 878e52f has failed:

On branch mergify/bp/v1.6/pr-16431
Your branch is up to date with 'origin/v1.6'.

You are currently cherry-picking commit 878e52f0b.
  (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:   sdk/cargo-build-bpf/src/main.rs
	modified:   sdk/cargo-test-bpf/src/main.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ci/test-stable.sh

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/

(cherry picked from commit 878e52f)

# Conflicts:
#	ci/test-stable.sh
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Apr 8, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 8, 2021

automerge label removed due to a CI failure

@codecov
Copy link

codecov bot commented Apr 8, 2021

Codecov Report

Merging #16432 (10aefc9) into v1.6 (a001c1c) will decrease coverage by 0.0%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             v1.6   #16432     +/-   ##
=========================================
- Coverage    79.9%    79.9%   -0.1%     
=========================================
  Files         412      412             
  Lines      109812   109812             
=========================================
- Hits        87823    87821      -2     
- Misses      21989    21991      +2     

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 8, 2021
@mergify mergify bot merged commit 6234090 into v1.6 Apr 8, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-16431 branch April 8, 2021 16:55
@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