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

Refactor - Simplify loader utils (backport #29699) #29757

Merged
merged 1 commit into from
Jan 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 18, 2023

This is an automatic backport of pull request #29699 done by Mergify.
Cherry-pick of ab97d37 has failed:

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

You are currently cherry-picking commit ab97d37e3.
  (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:   runtime/src/loader_utils.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf/benches/bpf_loader.rs
	both modified:   programs/bpf/tests/programs.rs

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

@mergify mergify bot added the conflicts label Jan 18, 2023
@Lichtso Lichtso force-pushed the mergify/bp/v1.14/pr-29699 branch 2 times, most recently from bdde4bc to 10e6bda Compare January 18, 2023 15:13
* Moves all the common code of tests and benches into loader utils.

* Removes write_sbf_program().

* Removes ignored test: test_program_sbf_test_use_latest_executor2().

(cherry picked from commit ab97d37)
@Lichtso Lichtso force-pushed the mergify/bp/v1.14/pr-29699 branch from 10e6bda to d920d84 Compare January 18, 2023 17:32
@Lichtso Lichtso removed the conflicts label Jan 18, 2023
@Lichtso Lichtso requested a review from tao-stones January 18, 2023 20:06
Copy link
Contributor

@tao-stones tao-stones left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@Lichtso Lichtso merged commit 0a3e52b into v1.14 Jan 19, 2023
@Lichtso Lichtso deleted the mergify/bp/v1.14/pr-29699 branch January 19, 2023 06:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants