Skip to content

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

Closed
mergify[bot] wants to merge 6 commits intohumblefrom
mergify/bp/humble/pr-1343
Closed

Organize docker and testspace event conditions (backport #1343)#1365
mergify[bot] wants to merge 6 commits intohumblefrom
mergify/bp/humble/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/humble/pr-1343
Your branch is up to date with 'origin/humble'.

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
	modified:   .github/workflows/ci.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

mergify bot and others added 6 commits June 3, 2022 21:17
(cherry picked from commit cea5764)

Co-authored-by: Vatan Aksoy Tezer <vatan@picknik.ai>
(cherry picked from commit 4502659)

Co-authored-by: Jafar <cafer.abdi@gmail.com>
(cherry picked from commit 541baa8)

Co-authored-by: Vatan Aksoy Tezer <vatan@picknik.ai>
(cherry picked from commit bf7d505)

Co-authored-by: Vatan Aksoy Tezer <vatan@picknik.ai>
(cherry picked from commit b8961af)

# Conflicts:
#	.github/workflows/docker.yaml
@mergify mergify bot added the conflicts label Jun 14, 2022
@codecov
Copy link
Copy Markdown

codecov bot commented Jun 14, 2022

Codecov Report

Merging #1365 (536a264) into humble (6288b0d) will decrease coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           humble    #1365      +/-   ##
==========================================
- Coverage   61.48%   61.46%   -0.01%     
==========================================
  Files         274      274              
  Lines       24940    24940              
==========================================
- Hits        15332    15328       -4     
- Misses       9608     9612       +4     
Impacted Files Coverage Δ
...nning_scene_monitor/src/planning_scene_monitor.cpp 45.29% <0.00%> (-0.43%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3ea8606...536a264. Read the comment docs.

@henningkayser
Copy link
Copy Markdown
Member

This one already made it into humble, closing

@mergify mergify bot deleted the mergify/bp/humble/pr-1343 branch August 10, 2022 17:21
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