Skip to content

Bump setup-ros (backport #777)#779

Merged
4ntn merged 2 commits intohumblefrom
mergify/bp/humble/pr-777
Jun 3, 2025
Merged

Bump setup-ros (backport #777)#779
4ntn merged 2 commits intohumblefrom
mergify/bp/humble/pr-777

Conversation

@mergify
Copy link
Copy Markdown
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 #777 done by Mergify.

Signed-off-by: Antón Casas <antoncasas@eprosima.com>
(cherry picked from commit 262aa56)

# Conflicts:
#	.github/workflows/ci.yml
@mergify mergify bot requested a review from pablogs9 as a code owner June 3, 2025 08:50
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jun 3, 2025

Cherry-pick of 262aa56 has failed:

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

You are currently cherry-picking commit 262aa56.
  (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

@mergify mergify bot added the conflicts label Jun 3, 2025
@mergify mergify bot mentioned this pull request Jun 3, 2025
Signed-off-by: Antón Casas <antoncasas@eprosima.com>
@4ntn 4ntn merged commit e0a1765 into humble Jun 3, 2025
20 checks passed
@4ntn 4ntn deleted the mergify/bp/humble/pr-777 branch June 3, 2025 09:14
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