Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 3, 2025

Fix failing CI due to ROS signing key change.


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

Signed-off-by: Antón Casas <[email protected]>
(cherry picked from commit 0e6e8e3)

# Conflicts:
#	.github/workflows/ci.yml
@mergify mergify bot added the conflicts label Jun 3, 2025
Copy link
Contributor Author

mergify bot commented Jun 3, 2025

Cherry-pick of 0e6e8e3 has failed:

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

You are currently cherry-picking commit 0e6e8e3.
  (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 <file>..." to mark resolution)
	both modified:   .github/workflows/ci.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

Signed-off-by: Antón Casas <[email protected]>
@4ntn 4ntn merged commit cbc5bf0 into rolling Jun 3, 2025
2 checks passed
@4ntn 4ntn deleted the mergify/bp/rolling/pr-249 branch June 3, 2025 09:20
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