Skip to content

Update branch master to support Rolling only#15

Merged
asorbini merged 5 commits intomasterfrom
asorbini/rolling-no-ff
Mar 29, 2021
Merged

Update branch master to support Rolling only#15
asorbini merged 5 commits intomasterfrom
asorbini/rolling-no-ff

Conversation

@asorbini
Copy link
Copy Markdown
Collaborator

@asorbini asorbini commented Mar 26, 2021

This PR updates branch master to make it buildable only with the Rolling release.

The PR removes all "feature flags" from static_config.hpp, including RMW_CONNEXT_RELEASE and any code meant to support earlier releases.

This PR must be merged before creating the next Galactic release in order to be able to create a maintenance branch from the updated master.

The code was changed assuming the following "feature configuration":

Feature Value
RMW_CONNEXT_RELEASE RMW_CONNEXT_RELEASE_ROLLING
RMW_CONNEXT_HAVE_PKG_RMW_DDS_COMMON 1
RMW_CONNEXT_HAVE_SCOPE_EXIT 1
RMW_CONNEXT_HAVE_GET_DOMAIN 1
RMW_CONNEXT_HAVE_OPTIONS 1
RMW_CONNEXT_HAVE_OPTIONS_PUBSUB 1
RMW_CONNEXT_HAVE_INCOMPATIBLE_QOS 1
RMW_CONNEXT_HAVE_INCOMPATIBLE_QOS_EVENT 1
RMW_CONNEXT_HAVE_LIFESPAN_QOS 1
RMW_CONNEXT_HAVE_MESSAGE_LOST 1
RMW_CONNEXT_HAVE_SERVICE_INFO 1
RMW_CONNEXT_HAVE_LOCALHOST_ONLY 1
RMW_CONNEXT_HAVE_TAKE_SEQ 1
RMW_CONNEXT_HAVE_SECURITY 1
RMW_CONNEXT_HAVE_COMMON_MUTEX 1
RMW_CONNEXT_HAVE_LOAN_MESSAGE 1
RMW_CONNEXT_HAVE_MESSAGE_INFO_TS 1
RMW_CONNEXT_HAVE_GET_INFO_BY_TOPIC 1
RMW_CONNEXT_HAVE_QOS_PROFILE_API 1
RMW_CONNEXT_HAVE_TIME_UTILS 1

Note to reviewers: It would be great to review these changes but they are somewhat trivial. I'm creating this PR mainly to keep track of them for future reference.

Signed-off-by: Andrea Sorbini <asorbini@rti.com>
Signed-off-by: Andrea Sorbini <asorbini@rti.com>
Signed-off-by: Andrea Sorbini <asorbini@rti.com>
@asorbini
Copy link
Copy Markdown
Collaborator Author

asorbini commented Mar 26, 2021

CI jobs to validate the changes:

  • ci_linux: Build Status
  • ci_osx: Build Status
  • ci_windows: Build Status

EDIT: validate uncrustify errors:

  • ci_linux: Build Status
  • ci_osx: Build Status
  • ci_windos: Build Status

Signed-off-by: Andrea Sorbini <asorbini@rti.com>
Signed-off-by: Andrea Sorbini <asorbini@rti.com>
Copy link
Copy Markdown
Contributor

@clalancette clalancette left a comment

Choose a reason for hiding this comment

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

I just briefly glanced at it, but what I did look at looks good to me. I think this is the right direction to go in, thanks!

Copy link
Copy Markdown
Member

@wjwwood wjwwood left a comment

Choose a reason for hiding this comment

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

I also only skimmed the code changes, but README lgtm, and the general pattern of changes lgtm.

I'm happy if CI is happy :)

@asorbini asorbini merged commit edc2515 into master Mar 29, 2021
@delete-merged-branch delete-merged-branch bot deleted the asorbini/rolling-no-ff branch March 29, 2021 20:25
@asorbini
Copy link
Copy Markdown
Collaborator Author

Making sure everything is good after merging:

  • ci_linux: Build Status
  • ci_osx: Build Status
  • ci_windows: Build Status

@asorbini asorbini added the galactic PR pertaining the Galactic release label Apr 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

galactic PR pertaining the Galactic release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants