Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 17, 2025

Upticks the compatible zephyr version.
The 'zephyr_library_import' needed to be replaced with 'zephyr_link_libraries' to avoid the 'whole-archive' linking behavior (which would consume massive amounts of RAM).
Other miscellaneous fixes were made in order to build.


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

* updates project to work with zephyr v4.0.x

* updating workflows for zephyr v4.0.x

* adds cmake prefix path, changes to ci image

* adds manual trigger to ci workflows

* updates CI workflows for all active ROS2 distros

* Get uart device with Zephyr 4's Devicetree-centric approach

Signed-off-by: Antón Casas <antoncasas@eprosima.com>

* Tested in v4.1.0 using manual installation on Ubuntu:24.04 base Docker image

Signed-off-by: Antón Casas <antoncasas@eprosima.com>

* Add v4.1.0 to CI and nightly

Signed-off-by: Antón Casas <antoncasas@eprosima.com>

* State SDK used in CI. Restore Z0rdon's info about docker image used.

Signed-off-by: Antón Casas <antoncasas@eprosima.com>

---------

Signed-off-by: Antón Casas <antoncasas@eprosima.com>
Co-authored-by: Antón Casas <antoncasas@eprosima.com>
(cherry picked from commit 7cbe6da)

# Conflicts:
#	.github/workflows/nightly.yml
@mergify
Copy link
Contributor Author

mergify bot commented Mar 17, 2025

Cherry-pick of 7cbe6da has failed:

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

You are currently cherry-picking commit 7cbe6da.
  (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/ci.yml
	modified:   README.md
	modified:   modules/libmicroros/CMakeLists.txt
	modified:   modules/libmicroros/microros_transports/serial/microros_transports.c
	modified:   prj.conf
	modified:   src/main.c

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

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

4ntn added 2 commits March 17, 2025 09:11
Signed-off-by: Antón Casas <antoncasas@eprosima.com>
Signed-off-by: Antón Casas <antoncasas@eprosima.com>
@4ntn 4ntn force-pushed the mergify/bp/rolling/pr-146 branch from f8d3374 to 1ed1863 Compare March 17, 2025 10:52
@pablogs9 pablogs9 merged commit f9fb282 into rolling Mar 17, 2025
3 checks passed
@pablogs9 pablogs9 deleted the mergify/bp/rolling/pr-146 branch March 17, 2025 14:31
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.

4 participants