Merge gz-launch7 ➡️ main #259
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: Addisu Z. Taddese <addisu@openrobotics.org>
* Use on `push` only on stable branches to avoid duplicate runs * Update project automation Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Merge ign-launch2 ➡️ ign-launch5
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Merge ign-launch5 ➡️ gz-launch6
Merge 6 ➡️ 7
* Fix windows warnings Signed-off-by: Nate Koenig <nate@openrobotics.org> * Fix more windows warnings Signed-off-by: Nate Koenig <natekoenig@gmail.com> * Added string include Signed-off-by: Nate Koenig <natekoenig@gmail.com> --------- Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: Nate Koenig <natekoenig@gmail.com> Co-authored-by: Nate Koenig <nate@openrobotics.org>
Merge gz-launch6 ➡️ gz-launch7
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Silvio Traversaro <silvio.traversaro@iit.it>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Merge gz-launch6 ➡️ gz-launch7
…ata (#253) Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
…ng windows tests (#249) Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
|
This looks like it's targeting |
Oops. Just corrected it |
|
@Crola1702 Were you intending to merge the complete branch? In that case, I won't feel confident enough to give you the green checkmark. |
azeey
reviewed
May 24, 2024
package.xml
Outdated
| <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?> | ||
| <package format="2"> | ||
| <name>gz-launch7</name> | ||
| <version>7.1.0</version> |
There was a problem hiding this comment.
This needs to be updated to 8.0.0.
There was a problem hiding this comment.
I bumped the package versions to the ones I see in CMakelists (6683744)
Signed-off-by: Crola1702 <cristobal.arroyo@ekumenlabs.com>
|
@azeey I see CI is passing (windows build shows just a warning). Should we merge it? |
azeey
approved these changes
May 29, 2024
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-rendering7 to main
Branch comparison: main...gz-launch7
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)