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

Don't override user provided compile definitions (backport #145) #146

Merged
merged 3 commits into from Jun 23, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 8, 2023

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Don't override user provided compile definitions

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
(cherry picked from commit 454a7bc)
Copy link
Contributor

@emersonknapp emersonknapp left a comment

Choose a reason for hiding this comment

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

@sloretz @quarkytale if you could merge these suggestions, then I will kick off CI. I think it's best not to change the CXX_STANDARD property for a released distro, instead better to just fix only the issue at hand

sloretz and others added 2 commits June 15, 2023 16:31
…faces.cmake

Co-authored-by: Emerson Knapp <537409+emersonknapp@users.noreply.github.com>
Signed-off-by: Shane Loretz <sloretz@google.com>
…nterfaces.cmake

Co-authored-by: Emerson Knapp <537409+emersonknapp@users.noreply.github.com>
Signed-off-by: Shane Loretz <sloretz@google.com>
@sloretz
Copy link
Contributor

sloretz commented Jun 15, 2023

if you could merge these suggestions, then I will kick off CI

Done, and thanks!

@emersonknapp
Copy link
Contributor

Pulls: #146
Gist: https://gist.githubusercontent.com/emersonknapp/81d08a8c20a38ac4693a120f1cf669fb/raw/da14e42ab8cbb020c798ecea9fe73194a8c399fc/ros2.repos
BUILD args:
TEST args:
ROS Distro: iron
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/12247

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@emersonknapp
Copy link
Contributor

@clalancette @sloretz merge ping!

@clalancette clalancette merged commit c111323 into iron Jun 23, 2023
3 checks passed
@clalancette clalancette deleted the mergify/bp/iron/pr-145 branch June 23, 2023 18:31
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.

None yet

3 participants