Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CP #1890 > support/v5.13] [core] Fixup build for Alpine #1895

Merged
merged 5 commits into from
Jan 17, 2025

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

Cherry-picked PR #1890 to branch support/v5.13.
The cherry-pick has failed.

The following files have caused conflicts:

ecal/core/src/ecal_process_stub.cpp

Resolving

Please resolve conflicts manually. You can use this PR and branch to your convenience.

git fetch origin
git checkout -b local/cherry-pick/3b22b6e/support/v5.13 origin/support/v5.13
git branch -u origin/cherry-pick/3b22b6e/support/v5.13
git cherry-pick 74b5dc1a1a9eea6fec34f1df37e5d58f93e2a4ac..3b22b6ee36c999dbcf5cdcae5a5d1f59593af249

# Resolve conflicts and use
#     git cherry-pick --continue
# until all conflicts are resolved.

git push -f origin HEAD:cherry-pick/3b22b6e/support/v5.13

After resolving all conflicts, rebase-merge this PR.

@Peguen Peguen force-pushed the cherry-pick/3b22b6e/support/v5.13 branch from 7686ab0 to 43896fc Compare January 14, 2025 08:23
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

clang-tidy made some suggestions

@@ -17,8 +17,7 @@
* ========================= eCAL LICENSE =================================
*/

#include <cstdlib>
#include <cerrno>
#include <errno.h>
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: inclusion of deprecated C++ header 'errno.h'; consider using 'cerrno' instead [modernize-deprecated-headers]

Suggested change
#include <errno.h>
#include <cerrno>

@Peguen Peguen marked this pull request as ready for review January 15, 2025 12:41
@Peguen Peguen enabled auto-merge (squash) January 15, 2025 12:43
@Peguen Peguen added the Auto Approve Request Automatic PR Approval label Jan 17, 2025
@Peguen Peguen merged commit 01f94b8 into support/v5.13 Jan 17, 2025
12 checks passed
@Peguen Peguen deleted the cherry-pick/3b22b6e/support/v5.13 branch January 17, 2025 09:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants