Skip to content

Organize docker and testspace event conditions (backport #1343)#1363

Closed
mergify[bot] wants to merge 1 commit intofoxyfrom
mergify/bp/foxy/pr-1343
Closed

Organize docker and testspace event conditions (backport #1343)#1363
mergify[bot] wants to merge 1 commit intofoxyfrom
mergify/bp/foxy/pr-1343

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Jun 14, 2022

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

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

You are currently cherry-picking commit b8961af0c.
  (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:   .dockerignore

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yaml
	both modified:   .github/workflows/docker.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 b8961af)

# Conflicts:
#	.github/workflows/ci.yaml
#	.github/workflows/docker.yaml
@mergify mergify bot added the conflicts label Jun 14, 2022
@mergify mergify bot deleted the mergify/bp/foxy/pr-1343 branch March 10, 2023 17:51
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.

1 participant