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

CI: Make BPF test suite a first-class citizen (backport #18535) #18570

Merged
merged 2 commits into from
Jul 10, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 10, 2021

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

On branch mergify/bp/v1.6/pr-18535
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 f1996ca0f.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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.io/

@mergify mergify bot added the conflicts label Jul 10, 2021
(cherry picked from commit f1996ca)

# Conflicts:
#	ci/test-stable.sh
@t-nelson t-nelson force-pushed the mergify/bp/v1.6/pr-18535 branch from 328d6f1 to 6376feb Compare July 10, 2021 18:24
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 10, 2021
@mergify mergify bot merged commit 868e757 into v1.6 Jul 10, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-18535 branch July 10, 2021 19:24
@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