Skip to content

Commit

Permalink
remove geographiclib_conversions submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
PonomarevDA committed Jul 31, 2024
1 parent b44dda9 commit 3c3eeac
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 15 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/catkin_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ jobs:
# 3. Install requirements
- name: Install innopolis_vtol_dynamics requirements
run: ./catkin_ws/src/innopolis_vtol_dynamics/uav_dynamics/uav_hitl_dynamics/install_requirements.sh
- name: Install geographiclib_conversions requirements
run: ./catkin_ws/src/innopolis_vtol_dynamics/uav_dynamics/geographiclib_conversions/scripts/install.sh
- name: Install uavcan_communicator requirements
run: |
cd catkin_ws/src/innopolis_vtol_dynamics/communicators/uavcan_communicator && \
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
[submodule "uav_dynamics/timed_roslaunch"]
path = uav_dynamics/timed_roslaunch
url = https://github.com/MoriKen254/timed_roslaunch.git
[submodule "uav_dynamics/geographiclib_conversions"]
path = uav_dynamics/geographiclib_conversions
url = https://github.com/RaccoonLabDev/geographiclib_conversions.git
[submodule "uav_dynamics/uav_hitl_dynamics"]
path = uav_dynamics/uav_hitl_dynamics
url = https://github.com/ZilantRobotics/uav_hitl_dynamics.git
Expand Down
14 changes: 6 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,28 @@ RUN apt-get install -y python3-catkin-tools

RUN if [[ "$ROS_DISTRO" = "melodic" ]] ; then apt-get install -y python-pip python-catkin-tools ; fi

# 2. Install requirements
# 2.1. geographiclib_conversions
COPY uav_dynamics/geographiclib_conversions uav_dynamics/geographiclib_conversions/
RUN ./uav_dynamics/geographiclib_conversions/scripts/install.sh
# Setup ROS
RUN source /opt/ros/$ROS_DISTRO/setup.bash && \
cd ../../ && \
git config --global http.sslverify false && \
catkin build

# 2.2. inno-sim-interface
# 2. Install requirements
# 2.1. inno-sim-interface
RUN sudo apt-get install -y ros-$ROS_DISTRO-rosauth && \
pip install bson pymongo protobuf Pillow twisted

# 2.3. innopolis_vtol_dynamics
# 2.2. innopolis_vtol_dynamics
COPY uav_dynamics/uav_hitl_dynamics/install_requirements.sh uav_dynamics/uav_hitl_dynamics/install_requirements.sh
COPY uav_dynamics/uav_hitl_dynamics/requirements.txt uav_dynamics/uav_hitl_dynamics/requirements.txt
RUN apt-get update && \
uav_dynamics/uav_hitl_dynamics/install_requirements.sh

# 2.4 tools/can
# 2.3 tools/can
COPY scripts/tools scripts/tools
RUN ./scripts/tools/can/install.sh --yes

# 2.5. communicators
# 2.4. communicators
COPY communicators/mavlink_communicator/ communicators/mavlink_communicator/
COPY communicators/uavcan_communicator/ communicators/uavcan_communicator/
COPY communicators/cyphal_communicator/scripts/config.sh communicators/cyphal_communicator/scripts/config.sh
Expand Down
1 change: 0 additions & 1 deletion catkin_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ catkin build innopolis_vtol_dynamics \
timed_roslaunch \
rosbridge_suite \
inno_sim_interface \
geographiclib_conversions \
uavcan_communicator
1 change: 0 additions & 1 deletion uav_dynamics/geographiclib_conversions
Submodule geographiclib_conversions deleted from fa374f

0 comments on commit 3c3eeac

Please sign in to comment.