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

Update gtest to 1.10.0 version #161

Merged
merged 2 commits into from
Sep 24, 2021

Conversation

j-rivero
Copy link
Contributor

Following #158 (review)

Two commits on top of pull #158:

  • 3e10ed7 to update gtest code
  • b7c5c23 to fix some warnings related to comparison of integer expressions of different signedness
  • aece008 clang needed c++11 to compile gtest properly

@j-rivero
Copy link
Contributor Author

ROS2 CI:

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

Copy link
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.

Looks good to me with green CI and once #158 is merged.

@j-rivero
Copy link
Contributor Author

j-rivero commented Sep 22, 2021

Another try:

  • Linux Build Status temporary issue - Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@j-rivero j-rivero force-pushed the jrivero/ros2-merge-fixes2-gtest-1.10 branch from aece008 to c5ab9ab Compare September 23, 2021 10:07
@j-rivero
Copy link
Contributor Author

Branch was not updated. Rebased:

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

Copy link
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.

CI looks good to me, so approving. What I'll suggest to get this in is:

  1. Merge Unify master and ros2 branches (merge ros2 into master) #158
  2. Rebase this one on top of master
  3. Merge this one
  4. Update https://github.com/ros2/ros2/blob/master/ros2.repos to point to the master branch here.
  5. Tag this repository and do a source release. I'll suggest bumping the major version to 3.0.
  6. Do a release of this package into Rolling.

@clalancette clalancette force-pushed the jrivero/ros2-merge-fixes2-gtest-1.10 branch from c5ab9ab to 692a0b8 Compare September 24, 2021 19:14
@clalancette
Copy link
Contributor

All right, I've approved, CI is green, and I verified that the changes before and after the rebase are 100% the same. So this is good to go, I'm going to go ahead and merge. Thanks @j-rivero .

@clalancette clalancette merged commit 70c018e into ros:master Sep 24, 2021
clalancette added a commit to ros2/ros2 that referenced this pull request Sep 24, 2021
In ros/urdfdom#158 and ros/urdfdom#161,
we merged the ros2 branch onto the master branch so there would be single,
unified release branch for all of urdfdom.  Now that that is done, we should switch
to using the master branch of urdfdom.
clalancette added a commit to ros2/ros2 that referenced this pull request Sep 27, 2021
In ros/urdfdom#158 and ros/urdfdom#161,
we merged the ros2 branch onto the master branch so there would be single,
unified release branch for all of urdfdom.  Now that that is done, we should switch
to using the master branch of urdfdom.
@j-rivero j-rivero mentioned this pull request Oct 4, 2021
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

2 participants