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.

Sign up for GitHub

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

Always install colcon bundle from source #35

Merged
merged 3 commits into from
Jun 18, 2019
Merged

Always install colcon bundle from source #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a157005
Always install colcon bundle from source
AAlon Jun 17, 2019
1053a66
Remove redundant installation of colcon bundle from post_rosdep_insta…
AAlon Jun 17, 2019
9fdfc47
Use a specific commit of colcon bundle
AAlon Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions gazebo/9/post_rosdep_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -c
wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add -
apt-get update

COLCON_BUNDLE_INSTALL_PATH="${HOME}/colcon-bundle"
rm -rf "${COLCON_BUNDLE_INSTALL_PATH}"
git clone https://github.com/colcon/colcon-bundle "${COLCON_BUNDLE_INSTALL_PATH}"
pip3 install --upgrade pip
pip install -U --editable "${COLCON_BUNDLE_INSTALL_PATH}"

G9_APT_FILE="/etc/ros/rosdep/sources.list.d/00-gazebo9.list"
rm -f "${G9_APT_FILE}"
touch "${G9_APT_FILE}"
Expand Down
16 changes: 16 additions & 0 deletions ros1_sa_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,22 @@ sh -c 'echo "deb http://13.52.195.14/ubuntu/main $(lsb_release -sc) main" > /et
apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
apt-get update && apt-get install --no-install-recommends -y python-rosdep python-rosinstall python3-colcon-common-extensions ros-$ROS_DISTRO-ros-base
pip3 install colcon-bundle colcon-ros-bundle

# Get latest colcon bundle
COLCON_BUNDLE_INSTALL_PATH="${HOME}/colcon-bundle"
rm -rf "${COLCON_BUNDLE_INSTALL_PATH}"
git clone https://github.com/colcon/colcon-bundle "${COLCON_BUNDLE_INSTALL_PATH}"

# Switch to commit "Support Melodic, fix aptitude trusted key config"
# https://github.com/colcon/colcon-bundle/commit/d5ea60e1a9adb34c5ba96e0fbd32fcd188cde15a
WORKING_DIRECTORY=${PWD}
cd ${COLCON_BUNDLE_INSTALL_PATH}
git checkout d5ea60e1a9adb34c5ba96e0fbd32fcd188cde15a
cd ${WORKING_DIRECTORY}

pip3 install --upgrade pip
pip install -U --editable "${COLCON_BUNDLE_INSTALL_PATH}"

# Remove the old rosdep sources.list
rm -rf /etc/ros/rosdep/sources.list.d/*
rosdep init && rosdep update
Expand Down