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

7 ➡️ 8 #324

Merged
merged 11 commits into from
Feb 14, 2023
Merged

7 ➡️ 8 #324

merged 11 commits into from
Feb 14, 2023

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Feb 3, 2023

➡️ Forward port

Port ign-fuel-tools7 to gz-fuel-tools8

Branch comparison: gz-fuel-tools8...ign-fuel-tools7

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

nkoenig and others added 10 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>
* 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>
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>
@azeey azeey requested a review from nkoenig as a code owner February 3, 2023 21:52
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Feb 3, 2023
@codecov
Copy link

codecov bot commented Feb 3, 2023

Codecov Report

Merging #324 (503f1ad) into gz-fuel-tools8 (a7a206d) will increase coverage by 0.12%.
The diff coverage is 94.44%.

@@                Coverage Diff                 @@
##           gz-fuel-tools8     #324      +/-   ##
==================================================
+ Coverage           75.10%   75.22%   +0.12%     
==================================================
  Files                  20       20              
  Lines                2864     2882      +18     
==================================================
+ Hits                 2151     2168      +17     
- Misses                713      714       +1     
Impacted Files Coverage Δ
src/FuelClient.cc 68.34% <92.30%> (+0.37%) ⬆️
src/ClientConfig.cc 82.08% <100.00%> (+0.38%) ⬆️

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

@@ -144,5 +142,5 @@ gz fuel edit -p -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Fortress%2
Use the `-b` option to make a resource public. For example:

```
gz fuel edit -b -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/%20Demo --header 'Private-token: YOUR_TOKEN'
gz fuel edit -b -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Fortress%20Demo --header 'Private-token: YOUR_TOKEN'
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
gz fuel edit -b -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Fortress%20Demo --header 'Private-token: YOUR_TOKEN'
gz fuel edit -b -u https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Garden%20Demo --header 'Private-token: YOUR_TOKEN'

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All the examples in this document use Fortress Demo. Any reason to change it to Garden since it's just showing how the gz fuel command works?

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@iche033 iche033 merged commit 8d06833 into gazebosim:gz-fuel-tools8 Feb 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants