Skip to content

Commit

Permalink
Fix embeddedRTPS repo (#33)
Browse files Browse the repository at this point in the history
(cherry picked from commit e0635a9)

# Conflicts:
#	microros_static_library_ide/library_generation/library_generation.sh
  • Loading branch information
pablogs9 authored and mergify-bot committed Oct 20, 2021
1 parent 0aac1fc commit 16a0ce4
Showing 1 changed file with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,13 @@ pushd firmware/mcu_ws > /dev/null
rm -rf eProsima/Micro-XRCE-DDS-Client
rm -rf uros/rmw_microxrcedds

<<<<<<< HEAD
git clone -b main https://github.com/micro-ROS/rmw_embeddedrtps uros/rmw_embeddedrtps
git clone -b main https://github.com/pablogs9/embeddedRTPS uros/embeddedRTPS
=======
git clone -b galactic https://github.com/micro-ROS/rmw_embeddedrtps uros/rmw_embeddedrtps
git clone -b galactic https://github.com/micro-ROS/embeddedRTPS uros/embeddedRTPS
>>>>>>> e0635a9 (Fix embeddedRTPS repo (#33))
fi

popd > /dev/null
Expand Down Expand Up @@ -85,4 +90,4 @@ for f in $(find $(pwd) -name .git -type d); do pushd $f > /dev/null; echo $(git
######## Fix permissions ########
sudo chmod -R 777 $BASE_PATH/libmicroros/
sudo chmod -R 777 $BASE_PATH/libmicroros/include/
sudo chmod -R 777 $BASE_PATH/libmicroros/libmicroros.a
sudo chmod -R 777 $BASE_PATH/libmicroros/libmicroros.a

0 comments on commit 16a0ce4

Please sign in to comment.