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

8 -> main #327

Merged
merged 16 commits into from
Feb 15, 2023
Merged

8 -> main #327

merged 16 commits into from
Feb 15, 2023

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Feb 14, 2023

➡️ Forward port

Port gz-fuel_tools8 to main

Branch comparison: main...merge_8_main_02132023

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

nkoenig and others added 16 commits November 17, 2022 15:50
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Signed-off-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Signed-off-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Signed-off-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Signed-off-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Adds a deprecation warning about fuel.ignitionrobotics.org

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added deprecation notice

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* spelling

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update tutorials to use gazebo

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix version numbers

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix some tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Retargeting to main

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* spaces

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Signed-off-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Adds a deprecation warning about fuel.ignitionrobotics.org

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added deprecation notice

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* spelling

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update tutorials to use gazebo

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix version numbers

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Change ignitionrobotics.org to gazebosim.org

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fix some tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* fix codecheck

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixed tests

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Update comments with ignitionrobotics

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* revert change

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* A few stragglers

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Signed-off-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Signed-off-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Crola1702 <cristobal.arroyo@ekumenlabs.com>
Signed-off-by: Crola1702 <cristobal.arroyo@ekumenlabs.com>
The FuelClient library was only looking for models in ~/.ignition/fuel/fuel.gazebosim.org regardless of which server models were downloaded from when checking if a model is cached. This caused models that used the deprecated ignitionrobotics.org URI to be redownloaded every time. This PR fixes it by adding ignitionrobotics.org as an additional server to check.

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@iche033 iche033 requested a review from nkoenig as a code owner February 14, 2023 00:52
@codecov
Copy link

codecov bot commented Feb 14, 2023

Codecov Report

Merging #327 (68709b0) into main (82daf44) will increase coverage by 0.15%.
The diff coverage is 94.44%.

❗ Current head 68709b0 differs from pull request most recent head 152666b. Consider uploading reports for the commit 152666b to get more accurate results

@@            Coverage Diff             @@
##             main     #327      +/-   ##
==========================================
+ Coverage   75.06%   75.22%   +0.15%     
==========================================
  Files          20       20              
  Lines        2864     2882      +18     
==========================================
+ Hits         2150     2168      +18     
  Misses        714      714              
Impacted Files Coverage Δ
src/FuelClient.cc 68.34% <92.30%> (+0.37%) ⬆️
src/ClientConfig.cc 82.08% <100.00%> (+0.38%) ⬆️
src/Interface.cc 85.71% <0.00%> (+1.78%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MacOS is not able to compile and I can see many tests failing on windows, is this expected?

    gz-msgs10Config.cmake
    gz-msgs10-config.cmake

@iche033
Copy link
Contributor Author

iche033 commented Feb 14, 2023

mac homebrew CI probably needs osrf/homebrew-simulation#2203 to be merged first

windows test failures are expected. I've seen those fail before

@iche033
Copy link
Contributor Author

iche033 commented Feb 15, 2023

mac homebrew CI probably needs osrf/homebrew-simulation#2203 to be merged first

homebrew CI build is fixed

@iche033 iche033 requested a review from ahcorde February 15, 2023 00:07
@iche033 iche033 merged commit e9c8557 into main Feb 15, 2023
@iche033 iche033 deleted the merge_8_main_02132023 branch February 15, 2023 17:26
@iche033 iche033 added the 🎵 harmonic Gazebo Harmonic label Feb 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants