Fix wget in maritime tutorials #2330

caguero · 2024-03-06T19:47:06Z

🦟 Bug fix

Summary

There were some problems with the wget commands. This patch should fix it.

Checklist

Signed all commits for DCO
Added tests
Updated documentation (as needed)
Updated migration guide (as needed)
Consider updating Python bindings (if the library has them)
codecheck passed (See contributing)
All tests passed (See test coverage)
While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Signed-off-by: Carlos Agüero <[email protected]>

codecov · 2024-03-06T20:53:35Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.97%. Comparing base (2ca64d0) to head (2d27c3f).

Additional details and impacted files

@@             Coverage Diff             @@
##           gz-sim8    #2330      +/-   ##
===========================================
+ Coverage    65.95%   65.97%   +0.01%     
===========================================
  Files          327      327              
  Lines        31347    31347              
===========================================
+ Hits         20676    20681       +5     
+ Misses       10671    10666       -5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

arjo129

Changes work for me now. However, it seems like we are also commiting a zip file and then removing the old files? Shouldnt we download just the zip or use a git commit hash in the url?

caguero · 2024-03-08T10:28:20Z

Changes work for me now. However, it seems like we are also commiting a zip file and then removing the old files? Shouldnt we download just the zip or use a git commit hash in the url?

@arjo129 , could you clarify that?

mabelzhang

I think Arjo is talking about these lines marked below.

It seems maybe the wget by directory was not working, so the new changes are wgetting the zip file and the model files individually.

mabelzhang · 2024-03-11T08:43:47Z

tutorials/surface_vehicles.md

@@ -28,8 +28,8 @@ To compile all the custom libraries in the right order `colcon` is recommended.
 The `colcon` tool is available on all platforms using `pip3`.

 ```bash
-mkdir ~/gazebo_maritime_ws
-wget https://raw.githubusercontent.com/gazebosim/gz-sim/gz-sim8/tutorials/files/surface_vehicles/gazebo_maritime_ws -o ~/gazebo_maritime_ws -r
+wget https://raw.githubusercontent.com/gazebosim/gz-sim/gz-sim8/tutorials/files/underwater_vehicles/gz_maritime_ws.zip -O ~/gz_maritime_ws.zip


I think this comment #2330 (review) is talking about this line.

But it appears the file added is tutorials/files/surface_vehicles/gz_maritime_ws.zip (under surface_vehicles), whereas this line is referring to a zip file in underwater_vehicles? Is that a typo?

The individual files removed are in surface_vehicles here: https://github.com/gazebosim/gz-sim/tree/gz-sim8/tutorials/files/surface_vehicles
There's no zip file in underwater_vehicles right now, nor in this PR: https://github.com/gazebosim/gz-sim/tree/gz-sim8/tutorials/files/underwater_vehicles

Oh, that was a typo, thanks! Fixed in 2d27c3f.

mabelzhang · 2024-03-11T08:44:05Z

tutorials/underwater_vehicles.md

+wget -r https://raw.githubusercontent.com/gazebosim/gz-sim/gz-sim8/tutorials/files/underwater_vehicles/my_lrauv/model.config -O ~/gazebo_maritime/models/my_lrauv/model.config
+wget -r https://raw.githubusercontent.com/gazebosim/gz-sim/gz-sim8/tutorials/files/underwater_vehicles/my_lrauv/model.sdf -O ~/gazebo_maritime/models/my_lrauv/model.sdf
+wget -r https://raw.githubusercontent.com/gazebosim/gz-sim/gz-sim8/tutorials/files/underwater_vehicles/my_lrauv/materials/textures/Tethys_Albedo.png -O ~/gazebo_maritime/models/my_lrauv/materials/textures/Tethys_Albedo.png
+wget -r https://raw.githubusercontent.com/gazebosim/gz-sim/gz-sim8/tutorials/files/underwater_vehicles/my_lrauv/materials/textures/Tethys_Metalness.png -O ~/gazebo_maritime/models/my_lrauv/materials/textures/Tethys_Metalness.png
+wget -r https://raw.githubusercontent.com/gazebosim/gz-sim/gz-sim8/tutorials/files/underwater_vehicles/my_lrauv/materials/textures/Tethys_Normal.png -O ~/gazebo_maritime/models/my_lrauv/materials/textures/Tethys_Normal.png
+wget -r https://raw.githubusercontent.com/gazebosim/gz-sim/gz-sim8/tutorials/files/underwater_vehicles/my_lrauv/materials/textures/Tethys_Roughness.png -O ~/gazebo_maritime/models/my_lrauv/materials/textures/Tethys_Roughness.png
+wget -r https://raw.githubusercontent.com/gazebosim/gz-sim/gz-sim8/tutorials/files/underwater_vehicles/my_lrauv/meshes/base.dae -O ~/gazebo_maritime/models/my_lrauv/meshes/base.dae
+wget -r https://raw.githubusercontent.com/gazebosim/gz-sim/gz-sim8/tutorials/files/underwater_vehicles/my_lrauv/meshes/propeller.dae -O ~/gazebo_maritime/models/my_lrauv/meshes/propeller.dae
+wget -r https://raw.githubusercontent.com/gazebosim/gz-sim/gz-sim8/tutorials/files/underwater_vehicles/my_lrauv/meshes/tethys.dae -O ~/gazebo_maritime/models/my_lrauv/meshes/tethys.dae


I think this comment #2330 (review) is talking about these lines

These individual files are in underwater_vehicles here: https://github.com/gazebosim/gz-sim/tree/gz-sim8/tutorials/files/underwater_vehicles/my_lrauv
These seem to be correct.

Let me know if you see anything suspicious there.

arjo129 · 2024-03-11T10:11:16Z

Yeah mabel is right. I think I got confused by the deletion of some of the files.

Signed-off-by: Carlos Agüero <[email protected]>

arjo129

Works for me.

* Fix wget in maritime tutorials. Signed-off-by: Carlos Agüero <[email protected]> Signed-off-by: Gaurav Kumar <[email protected]>

Fix wget in maritime tutorials.

5ccb0c4

Signed-off-by: Carlos Agüero <[email protected]>

caguero requested review from mabelzhang and mjcarroll as code owners March 6, 2024 19:47

github-actions bot added the 🎵 harmonic Gazebo Harmonic label Mar 6, 2024

caguero mentioned this pull request Mar 6, 2024

[Bug] surface_vehicles.md workspace wget command not working #2329

Closed

ahcorde approved these changes Mar 6, 2024

View reviewed changes

arjo129 reviewed Mar 7, 2024

View reviewed changes

mabelzhang reviewed Mar 11, 2024

View reviewed changes

Fix link.

2d27c3f

Signed-off-by: Carlos Agüero <[email protected]>

arjo129 approved these changes Mar 12, 2024

View reviewed changes

caguero merged commit 7143110 into gz-sim8 Mar 12, 2024
9 of 10 checks passed

caguero deleted the caguero/fix_wget branch March 12, 2024 08:42

GauravKumar9920 pushed a commit to GauravKumar9920/gz-sim that referenced this pull request Mar 30, 2024

Fix wget in maritime tutorials (gazebosim#2330)

8c63d88

* Fix wget in maritime tutorials. Signed-off-by: Carlos Agüero <[email protected]> Signed-off-by: Gaurav Kumar <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix wget in maritime tutorials #2330

Fix wget in maritime tutorials #2330

caguero commented Mar 6, 2024

codecov bot commented Mar 6, 2024 •

edited

Loading

arjo129 left a comment

caguero commented Mar 8, 2024

mabelzhang left a comment

mabelzhang Mar 11, 2024

caguero Mar 11, 2024

mabelzhang Mar 11, 2024

caguero Mar 11, 2024

arjo129 commented Mar 11, 2024

arjo129 left a comment

Fix wget in maritime tutorials #2330

Fix wget in maritime tutorials #2330

Conversation

caguero commented Mar 6, 2024

🦟 Bug fix

Summary

Checklist

codecov bot commented Mar 6, 2024 • edited Loading

Codecov Report

arjo129 left a comment

Choose a reason for hiding this comment

caguero commented Mar 8, 2024

mabelzhang left a comment

Choose a reason for hiding this comment

mabelzhang Mar 11, 2024

Choose a reason for hiding this comment

caguero Mar 11, 2024

Choose a reason for hiding this comment

mabelzhang Mar 11, 2024

Choose a reason for hiding this comment

caguero Mar 11, 2024

Choose a reason for hiding this comment

arjo129 commented Mar 11, 2024

arjo129 left a comment

Choose a reason for hiding this comment

codecov bot commented Mar 6, 2024 •

edited

Loading