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

Don't update if already an executable (backport #18221) #18252

Merged
merged 1 commit into from
Jun 27, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 27, 2021

This is an automatic backport of pull request #18221 done by Mergify.
Cherry-pick of 2fbedd8 has failed:

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

You are currently cherry-picking commit 2fbedd834.
  (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:   programs/bpf/c/src/invoke/invoke.c
	modified:   programs/bpf/rust/invoke/src/lib.rs
	modified:   programs/bpf/tests/programs.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/message_processor.rs

To fix up this pull request, you can check it out 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 Jun 27, 2021
(cherry picked from commit 2fbedd8)

# Conflicts:
#	runtime/src/message_processor.rs
@t-nelson t-nelson force-pushed the mergify/bp/v1.6/pr-18221 branch from d39e86f to 4979122 Compare June 27, 2021 18:01
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 27, 2021
@codecov
Copy link

codecov bot commented Jun 27, 2021

Codecov Report

Merging #18252 (4979122) into v1.6 (9413051) will decrease coverage by 0.3%.
The diff coverage is 81.5%.

@@            Coverage Diff            @@
##             v1.6   #18252     +/-   ##
=========================================
- Coverage    82.9%    82.5%   -0.4%     
=========================================
  Files         414      424     +10     
  Lines      114017   117361   +3344     
=========================================
+ Hits        94544    96925   +2381     
- Misses      19473    20436    +963     

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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