Merged
Conversation
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This pull request standardizes the workspace directory used for ArduSub-related installations and environment variables across the project. Specifically, it replaces all references to
ardupilot_wswithardusub_wsin installation scripts and Dockerfiles, ensuring consistent paths and reducing confusion or errors during setup. Additionally, it updates environment variable exports and adds a new Ardusub installation step to the ROS-Gazebo setup script.Key changes include:
Workspace Path Standardization:
/opt/ardusub_wsor/home/$USER/ardusub_wsinstead of the previousardupilot_wspaths for cloning, building, and referencing ArduSub and ardupilot_gazebo repositories. This affects the following files:.docker/jazzy.amd64.dockerfile[1].docker/jazzy.arm64v8.dockerfile[2]extras/ardusub-ubuntu-install.sh[3] [4] andextras/ardusub-ubuntu-install-local.sh[5] [6].Environment Variable Updates:
ardusub_wspaths, ensuring that tools and plugins reference the correct locations. [1] [2] [3] [4]Installation Script Enhancements:
extras/ros-jazzy-gz-harmonic-install.shscript now includes a dedicated Ardusub installation step using the new local install script, and sets up the corresponding environment variables in the user's.bashrc.These changes improve maintainability and clarity for anyone setting up or working with ArduSub in this project.