Skip to content

Fix rolling (backport #687)#689

Merged
pablogs9 merged 3 commits intohumblefrom
mergify/bp/humble/pr-687
Mar 7, 2024
Merged

Fix rolling (backport #687)#689
pablogs9 merged 3 commits intohumblefrom
mergify/bp/humble/pr-687

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Mar 7, 2024

This is an automatic backport of pull request #687 done by Mergify.
Cherry-pick of 944843d has failed:

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

You are currently cherry-picking commit 944843d.
  (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:   package.xml
	modified:   scripts/create_firmware_ws.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml
	both modified:   .github/workflows/nightly.yml
	both modified:   config/host/generic/client_host_packages.repos
	both modified:   scripts/create_ws.sh

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

* Fix rolling

Revert "Fix rolling"

This reverts commit c808931.

Remove ament lint common

Remove  ament_lint_auto

Remove ament_cmake

Update Checkout

add test

Fix package

Fix

Remove osrf_testing_tools_cpp

Update ubuntu

Add test_interface_files

Revert "Update ubuntu"

This reverts commit 3c4939a.

Revert "Add test_interface_files"

This reverts commit 75f9e21.

* Update repos

* Add test_interface_files

(cherry picked from commit 944843d)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/nightly.yml
#	config/host/generic/client_host_packages.repos
#	scripts/create_ws.sh
@mergify mergify Bot requested a review from pablogs9 as a code owner March 7, 2024 08:56
@mergify mergify Bot added the conflicts label Mar 7, 2024
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Mar 7, 2024

Cherry-pick of 944843d has failed:

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

You are currently cherry-picking commit 944843d.
  (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:   package.xml
	modified:   scripts/create_firmware_ws.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml
	both modified:   .github/workflows/nightly.yml
	both modified:   config/host/generic/client_host_packages.repos
	both modified:   scripts/create_ws.sh

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 mentioned this pull request Mar 7, 2024
@pablogs9 pablogs9 merged commit 41edef6 into humble Mar 7, 2024
@pablogs9 pablogs9 deleted the mergify/bp/humble/pr-687 branch March 7, 2024 09:16
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