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

Add back rabbitmq_cli tests to CI (backport #11402) #11404

Merged
merged 1 commit into from
Jun 6, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 6, 2024

Accidentally left out of #11343


This is an automatic backport of pull request #11402 done by Mergify.

Accidentally left out of #11343

(cherry picked from commit bdd18ed)

# Conflicts:
#	.github/workflows/templates/test-mixed-versions.template.yaml
#	.github/workflows/templates/test.template.yaml
#	.github/workflows/test-mixed-versions.yaml
#	.github/workflows/test.yaml
Copy link
Author

mergify bot commented Jun 6, 2024

Cherry-pick of bdd18ed has failed:

On branch mergify/bp/v3.13.x/pr-11402
Your branch is up to date with 'origin/v3.13.x'.

You are currently cherry-picking commit bdd18ed800.
  (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/templates/test-mixed-versions.template.yaml
	deleted by us:   .github/workflows/templates/test.template.yaml
	both modified:   .github/workflows/test-mixed-versions.yaml
	both modified:   .github/workflows/test.yaml

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 mergify bot assigned pjk25 Jun 6, 2024
@michaelklishin michaelklishin merged commit 51110be into v3.13.x Jun 6, 2024
9 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-11402 branch June 6, 2024 23:03
michaelklishin added a commit that referenced this pull request Jun 6, 2024
Add back rabbitmq_cli tests to CI (backport #11402) (backport #11404)
michaelklishin added a commit that referenced this pull request Jun 6, 2024
Add back rabbitmq_cli tests to CI (backport #11402) (backport #11404) (backport #11405)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants