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

Merge 6 -> 7 #269

Merged
merged 10 commits into from
Aug 5, 2024
Merged

Merge 6 -> 7 #269

merged 10 commits into from
Aug 5, 2024

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Aug 2, 2024

➡️ Forward port

Port gz-launch6 to gz-launch7

Branch comparison: gz-launch7...gz-launch6

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

azeey and others added 10 commits May 21, 2024 17:47
* Disable `ManagerTest.RunLs` test on windows
* Add dependency on ign-utils
* Use Pathname to determine if path is absolute
* Disable ign_TEST on windows, disable ManagerTest.RunEnvPre because it timesout
* Disable one more test on windows
---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
* Fix windows warnings (#199)

* Fix windows warnings

Signed-off-by: Nate Koenig <[email protected]>

* Fix more windows warnings

Signed-off-by: Nate Koenig <[email protected]>

* Added string include

Signed-off-by: Nate Koenig <[email protected]>

---------

Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>

* Include vector

Signed-off-by: Crola1702 <[email protected]>

---------

Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Nate Koenig <[email protected]>
Signed-off-by: Crola1702 <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
* Supress msvc dll exported interface warning
* Add missing linked library
* Add missing linked library
* Add mising linked library
* Add linked library
* Add missing linked library

Signed-off-by: Jorge J. Perez <[email protected]>

---------

Signed-off-by: Jorge J. Perez <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@iche033 iche033 requested a review from nkoenig as a code owner August 2, 2024 17:00
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Aug 2, 2024
@iche033 iche033 merged commit 0851899 into gz-launch7 Aug 5, 2024
10 checks passed
@iche033 iche033 deleted the merge_6_7_20240802 branch August 5, 2024 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants