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

iox-#1504 Integration branch for iceoryx v2.0.3 release #1505

Merged
merged 25 commits into from
Jan 30, 2023

Conversation

elBoberido
Copy link
Member

@elBoberido elBoberido commented Jul 14, 2022

Pre-Review Checklist for the PR Author

  1. Code follows the coding style of CONTRIBUTING.md
  2. Tests follow the best practice for testing
  3. Changelog updated in the unreleased section including API breaking changes
  4. Branch follows the naming format (iox-#123-this-is-a-branch)
  5. Commits messages are according to this guideline
    • Commit messages have the issue ID (iox-#123 commit text)
    • Commit messages are signed (git commit -s)
    • Commit author matches Eclipse Contributor Agreement (and ECA is signed)
  6. Update the PR title
    • Follow the same conventions as for commit messages
    • Link to the relevant issue
  7. Relevant issues are linked
  8. Add sensible notes for the reviewer
  9. All checks have passed (except task-list-completed)
  10. Assign PR to reviewer

Notes for Reviewer

This is the integration branch for all PRs which will be part of iceoryx v2.0.3. This branch must pass the ROS CI before it can be merged to the release branch.

  • set release date for bugfix release
  • ROS 2 CI has run
  • Confirm that generated include folders don't change for release 2.0.3
  • set version numbers to 2.0.3 using tools/iceoryx_release script

Checklist for the PR Reviewer

  • Commits are properly organized and messages are according to the guideline
  • Code according to our coding style and naming conventions
  • Unit tests have been written for new behavior
    • Each unit test case has a unique UUID
  • Public API changes are documented via doxygen
  • Copyright owner are updated in the changed files
  • PR title describes the changes

Post-review Checklist for the PR Author

  1. All open points are addressed and tracked via issues

References

elfenpiff and others added 6 commits June 30, 2022 19:09
Signed-off-by: Christian Eltzschig <me@elchris.org>
Signed-off-by: Christian Eltzschig <me@elchris.org>
Signed-off-by: Christian Eltzschig <me@elchris.org>
Signed-off-by: Dietrich Krönke <dietrich.kroenke@apex.ai>
Signed-off-by: Christian Eltzschig <me@elchris.org>
@elBoberido elBoberido changed the title iox-#1504 Enable CI for integration branches iox-#1504 Integration branch for iceoryx v2.0.3 release Jul 14, 2022
@codecov
Copy link

codecov bot commented Jul 14, 2022

Codecov Report

Merging #1505 (896be65) into release_2.0 (418d929) will increase coverage by 0.03%.
The diff coverage is 58.33%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release_2.0    #1505      +/-   ##
===============================================
+ Coverage        78.89%   78.93%   +0.03%     
===============================================
  Files              370      370              
  Lines            14705    14716      +11     
  Branches          2059     2061       +2     
===============================================
+ Hits             11602    11616      +14     
+ Misses            2420     2419       -1     
+ Partials           683      681       -2     
Flag Coverage Δ
unittests 78.15% <58.33%> (+0.02%) ⬆️
unittests_timing 15.48% <0.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
iceoryx_posh/source/roudi/process_manager.cpp 64.64% <0.00%> (ø)
iceoryx_hoofs/source/posix_wrapper/file_lock.cpp 40.54% <50.00%> (+0.12%) ⬆️
...sh/include/iceoryx_posh/internal/popo/wait_set.inl 89.81% <66.66%> (-1.37%) ⬇️
...osh/internal/popo/building_blocks/chunk_sender.inl 87.85% <100.00%> (+0.11%) ⬆️
...lude/iceoryx_posh/internal/popo/base_publisher.inl 90.90% <0.00%> (-9.10%) ⬇️
...nternal/roudi/introspection/port_introspection.inl 82.84% <0.00%> (+0.72%) ⬆️
iceoryx_hoofs/source/posix_wrapper/timer.cpp 63.90% <0.00%> (+0.82%) ⬆️
iceoryx_hoofs/source/concurrent/loffli.cpp 91.42% <0.00%> (+11.42%) ⬆️

…release-2.0

Iox #1440 fix file lock leak in release 2.0
elBoberido and others added 3 commits July 14, 2022 18:39
…rarcter-in-roudi-release-2.0

iox-#1476 Replace single quotation mark with apostrophe [release_2.0]
Signed-off-by: Dietrich Krönke <dietrich.kroenke@apex.ai>
…e-include-directories-cmake-release_2.0

iox-#1481 Set PREFIX in CMake directly [release_2.0]
@mossmaurice mossmaurice self-assigned this Jan 17, 2023
@mossmaurice mossmaurice added the bugfix Solves a bug label Jan 17, 2023
@mossmaurice
Copy link
Contributor

@dkroenke @elBoberido Due to #1850 I would suggest a v2.0.3 release end of CW3. Today, I will trigger the ROS 2 CI.

mossmaurice and others added 3 commits January 17, 2023 10:58
Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
Signed-off-by: Dietrich Krönke <dietrich.kroenke@apex.ai>
Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
elfenpiff and others added 3 commits January 17, 2023 11:51
Signed-off-by: Christian Eltzschig <christian.eltzschig@apex.ai>
Signed-off-by: Christian Eltzschig <me@elchris.org>
Signed-off-by: Dietrich Krönke <dietrich.kroenke@apex.ai>
mossmaurice
mossmaurice previously approved these changes Jan 17, 2023
Copy link
Contributor

@mossmaurice mossmaurice left a comment

Choose a reason for hiding this comment

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

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
mossmaurice
mossmaurice previously approved these changes Jan 17, 2023
@mossmaurice
Copy link
Contributor

@clalancette With an additional --packages-up-to rmw_cyclonedds_cpp the Linux job ran just fine this morning. With the default args there was Java error. I suppose, that's a Jenkin issue and nothing we have to chase after?

cc @dkroenke @elBoberido

@mossmaurice
Copy link
Contributor

Re-triggered the build this morning:

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

@mossmaurice
Copy link
Contributor

@elBoberido @dkroenke After #1856 was merged to master I'll cherry pick the commits to this PR to be included in v2.0.3

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
@mossmaurice
Copy link
Contributor

mossmaurice commented Jan 25, 2023

Just re-triggered the build including the changes from #1856:

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

cc @dkroenke @elBoberido

@dkroenke
Copy link
Member

@mossmaurice @elBoberido

Checked that the include directories of the installed headers are still unique:

isolated workspace:

  • ros2_humble/install/iceoryx_hoofs/include/iceoryx/v2.0.2/iceoryx_hoofs
  • ros2_humble/install/iceoryx_hoofs/include/iceoryx/v2.0.3/iceoryx_hoofs

merged workspace:

  • ros2_humble/install/include/iceoryx/v2.0.2/iceoryx_hoofs
  • ros2_humble/install/include/iceoryx/v2.0.3/iceoryx_hoofs

Copy link
Member

@dkroenke dkroenke left a comment

Choose a reason for hiding this comment

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

Looks OK so far, let's wait with the release tag for 2.0.3 for some days and check https://ci.ros2.org/view/nightly/ if there are errors or warnings.

@mossmaurice mossmaurice merged commit 40ef24e into release_2.0 Jan 30, 2023
@elBoberido elBoberido deleted the integration-release-2-0-3 branch September 30, 2023 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Solves a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants