Merge 12 -> main #886
Merged
Merge 12 -> main #886
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
Signed-off-by: William Lew <[email protected]>
Signed-off-by: William Lew <[email protected]>
Signed-off-by: William Lew <[email protected]>
* GitHub CI: only build pxr on 20.04 * Add comment mentioning issue #869 Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: ahcorde <[email protected]> Co-authored-by: Ashton Larkin <[email protected]>
Signed-off-by: ahcorde <[email protected]> Co-authored-by: Ashton Larkin <[email protected]>
Prepare for 12.4.0~pre1 prerelease
Signed-off-by: ahcorde <[email protected]> Co-authored-by: Ashton Larkin <[email protected]>
* enable static checkers Signed-off-by: Louise Poubel <[email protected]> * Fix focal linting errors Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Louise Poubel <[email protected]>
* Fix a lack of ParserConfig propagation. Copied from patch in RobotLocomotion/drake#16791 by jwnimmer-tri. * Pass ParserConfig to parser helper functions Require ParserConfig argument in parser.cc's private helper functions: initDoc, initXml, and _initFile. Signed-off-by: Steve Peters <[email protected]>
|
why do I so often target the wrong branch with forward-porting PRs |
chapulina
added
🌱 garden
|
auto-merge enabled |
Codecov Report
@@ Coverage Diff @@
## main #886 +/- ##
==========================================
- Coverage 88.65% 88.16% -0.50%
==========================================
Files 92 100 +8
Lines 14222 14630 +408
==========================================
+ Hits 12608 12898 +290
- Misses 1614 1732 +118
Continue to review full report at Codecov.
|
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 sdf12 to main
Branch comparison: main...sdf12
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)