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

[7.17] github-action: enable merge-queue (backport #12579) #12582

Merged
merged 2 commits into from
Feb 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 6, 2024

This is an automatic backport of pull request #12579 done by Mergify.
Cherry-pick of 4312fa7 has failed:

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

You are currently cherry-picking commit 4312fa73d.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/ci-docs.yml
	both modified:   .github/workflows/ci.yml
	deleted by us:   .github/workflows/terraform-fmt.yml

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/pull-requests/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 4312fa7)

# Conflicts:
#	.github/workflows/ci-docs.yml
#	.github/workflows/ci.yml
#	.github/workflows/terraform-fmt.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 6, 2024
@mergify mergify bot assigned v1v Feb 6, 2024
Comment on lines 8 to 16
<<<<<<< HEAD
=======
paths-ignore: # When updating the list of expressions also update ci-docs.yml
- '**.md'
- '**.asciidoc'
- '**.png'
- '**.svg'
merge_group:
>>>>>>> 4312fa73d (github-action: enable merge-queue (#12579))
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<<<<<<< HEAD
=======
paths-ignore: # When updating the list of expressions also update ci-docs.yml
- '**.md'
- '**.asciidoc'
- '**.png'
- '**.svg'
merge_group:
>>>>>>> 4312fa73d (github-action: enable merge-queue (#12579))
merge_group:

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Feb 6, 2024
@mergify mergify bot merged commit 2a448a9 into 7.17 Feb 6, 2024
14 of 15 checks passed
@mergify mergify bot deleted the mergify/bp/7.17/pr-12579 branch February 6, 2024 13:21
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