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

[8.9] buildkite: package definition (backport #11399) #11422

Merged
merged 2 commits into from
Aug 17, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 17, 2023

This is an automatic backport of pull request #11399 done by Mergify.
Cherry-pick of 28541e9 has failed:

On branch mergify/bp/8.9/pr-11399
Your branch is up to date with 'origin/8.9'.

You are currently cherry-picking commit 28541e96.
  (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:
	new file:   .buildkite/package.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   catalog-info.yaml

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

(cherry picked from commit 28541e9)

# Conflicts:
#	catalog-info.yaml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 17, 2023
@mergify mergify bot assigned v1v Aug 17, 2023
catalog-info.yaml Outdated Show resolved Hide resolved
@v1v v1v removed the conflicts There is a conflict in the backported pull request label Aug 17, 2023
@v1v v1v merged commit 48ce7c1 into 8.9 Aug 17, 2023
@v1v v1v deleted the mergify/bp/8.9/pr-11399 branch August 17, 2023 08:25
v1v added a commit that referenced this pull request Aug 17, 2023
* upstream/8.9:
  [8.9] buildkite: package definition (backport #11399) (backport #11401) (#11422)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant