Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 15, 2025


This is an automatic backport of pull request #157 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Dec 15, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Dec 15, 2025

Cherry-pick of 229ffc0 has failed:

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

You are currently cherry-picking commit 229ffc0.
  (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:   .github/workflows/nightly.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml
	both modified:   modules/libmicroros/libmicroros.mk

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 Dec 15, 2025
* Free space in docker

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Build script as step

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Nightly

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

---------

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado EugenioCollado force-pushed the mergify/bp/humble/pr-157 branch from ac24004 to 257f577 Compare December 15, 2025 11:41
@EugenioCollado EugenioCollado merged commit cfbddc5 into humble Dec 15, 2025
0 of 2 checks passed
@EugenioCollado EugenioCollado deleted the mergify/bp/humble/pr-157 branch December 15, 2025 11:41
git clone -b humble https://github.com/ament/googletest src/googletest; \
git clone -b humble https://github.com/ros2/ament_cmake_ros src/ament_cmake_ros; \
git clone -b humble https://github.com/ament/ament_index src/ament_index; \
git clone -b jazzy https://github.com/ament/ament_cmake src/ament_cmake; \

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

checking out on humble branch this should be humble , not jazzy right ? May be this was accidentally done ?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

3 participants