Forward port 6 to main 2023-07-26 #222
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
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: Louise Poubel <[email protected]> Signed-off-by: Louise Poubel <[email protected]>
* Return a message on asset error Signed-off-by: Nate Koenig <[email protected]> * cleanup Signed-off-by: Nate Koenig <[email protected]> * remove debug Signed-off-by: Nate Koenig <[email protected]> Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
This reverts commit f1d1ae9.
* add stop and pause to websocket server Signed-off-by: Mabel Zhang <[email protected]> * better comments Signed-off-by: Mabel Zhang <[email protected]> * generalize sim pause/stop to a service operation Signed-off-by: Mabel Zhang <[email protected]> * Use RequestRaw Signed-off-by: Nate Koenig <[email protected]> * Rename service to request Signed-off-by: Nate Koenig <[email protected]> * Update to new request signature Signed-off-by: Nate Koenig <[email protected]> --------- Signed-off-by: Mabel Zhang <[email protected]> Signed-off-by: Nate Koenig <[email protected]> Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]>
* Small cleanup fixes Signed-off-by: Nate Koenig <[email protected]> * Missing colon Signed-off-by: Nate Koenig <[email protected]> * Fix linting Signed-off-by: Steve Peters <[email protected]> --------- Signed-off-by: Nate Koenig <[email protected]> Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Steve Peters <[email protected]>
The LICENSE file contained a copy of the stanze used at the top of source code files, while the actual license was in the COPYING file. So remove the stanza and put the actual Apache 2.0 license text in LICENSE. Similar to gazebosim/gz-math#521. Signed-off-by: Steve Peters <[email protected]>
Version v2 of the actions/checkout workflow is deprecated, so switch to v3. Part of gazebo-tooling/release-tools#862. Signed-off-by: Steve Peters <[email protected]>
Merge ign-launch2 ➡️ ign-launch5
Merge ign-launch5 ➡️ gz-launch6
Codecov Report
@@ Coverage Diff @@
## main #222 +/- ##
=======================================
Coverage 56.90% 56.90%
=======================================
Files 3 3
Lines 413 413
=======================================
Hits 235 235
Misses 178 178 |
ahcorde
approved these changes
Jul 26, 2023
mjcarroll
approved these changes
Jul 26, 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 gz-launch6 to main
Branch comparison: https://github.com/gazebosim//compare/<TO_BRANCH>...<FROM_BRANCH>
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)