Merge ign-gazebo3 ➡️ ign-gazebo6 #2079
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…azebosim#2006) Signed-off-by: Silvio Traversaro <[email protected]> * TriggeredPublisher: don't catch FatalException It has been removed from recent versions of protobuf. Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Steve Peters <[email protected]>
…fore `Finalize` (gazebosim#2047) * Adds a warning if the `Server` method of a `TestFixture` is called before `Finalize This commit adds a warning if someone were to call `Server()` before `Finalize`. The rationale for this is because I made the mistake of not calling `Finalize` ina program I was writing. It took me some time to track down the root cause of the problem. I figure if we warn users it should be immediately obvious. Signed-off-by: Arjo Chakravarty <[email protected]> * switch to gzwarn over ignwarn Signed-off-by: Arjo Chakravarty <[email protected]> * ignwarn cause citadel :( Signed-off-by: Arjo Chakravarty <[email protected]> --------- Signed-off-by: Arjo Chakravarty <[email protected]>
gazebosim#2052) This fixes errors such as ``` Error [Utils.cc:174] Missing element description for [persistent] ``` Signed-off-by: Addisu Z. Taddese <[email protected]>
) Signed-off-by: Arjo Chakravarty <[email protected]>
Codecov Report
@@ Coverage Diff @@
## ign-gazebo6 #2079 +/- ##
============================================
Coverage 65.35% 65.36%
============================================
Files 327 327
Lines 27002 27089 +87
============================================
+ Hits 17648 17706 +58
- Misses 9354 9383 +29
|
ahcorde
approved these changes
Aug 16, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port
ign-gazebo3➡️ign-gazebo6Somehow I didn't use a merge commit in the last forward port (#2078). I did
git merge origin/ign-gazebo3 --no-committo see if there were changes and thengit commit, but apparently, that doesn't do a merge commit? Anyway, this should fix that. The diff should be emptyBranch comparison: ign-gazebo6...ign-gazebo3
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)