Skip to content

Conversation

pjdewitte
Copy link
Contributor

Checks against overwriting manual changes and against overwriting the template itself.

I'm aware of the pull request #651. It seems the changes are compatible, but they won't merge automatically.

Let me know if you have any feedback.

Checks against overwriting manual changes and against overwriting the template itself
Copy link
Member

@Jaeyoung-Lim Jaeyoung-Lim left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution!

Would you be able to look into the catkin build failures in the CI?

@pjdewitte
Copy link
Contributor Author

Hi @Jaeyoung-Lim,

What is the recommended way to reproduce the Github workflows / build locally?

In the meantime, I changed what I think is the cause of the build failure.

Copy link
Member

@Jaeyoung-Lim Jaeyoung-Lim left a comment

Choose a reason for hiding this comment

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

Thanks, that seems to have done the trick

You can look at the github actions instructions on how to setup the same environment on your system

@Jaeyoung-Lim Jaeyoung-Lim merged commit 054e0a1 into PX4:master Jan 1, 2021
RyosukeMatsushima pushed a commit to RyosukeMatsushima/PX4-SITL_gazebo that referenced this pull request Jun 21, 2022
)

* Jinja generation: add protection against accidental overwriting

Checks against overwriting manual changes and against overwriting the template itself

* Support Python 3.5

* Overwrite protection: ignore leading and trailing whitespace

Co-authored-by: Pieter-Jan Dewitte <pieterjan.dewitte@atmosuav.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants