Skip to content

Commit

Permalink
Fix name
Browse files Browse the repository at this point in the history
  • Loading branch information
ShikherVerma committed Jun 29, 2017
1 parent 9798ec1 commit 84e71f2
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ before_install:
- sudo sh -c "echo \"deb http://packages.ros.org/ros/ubuntu $ROS_CI_DESKTOP main\" > /etc/apt/sources.list.d/ros-latest.list"
- wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
- sudo apt-get update -qq
- sudo apt-get install -y python-catkin-pkg python-rosdep python-wstool ros-$ROS_DISTRO-catkin
- sudo apt-get install -y python-catkin-pkg python-rosdep python-wstool ros-$ROS_DISTRO-catkin
- source /opt/ros/$ROS_DISTRO/setup.bash
# Prepare rosdep to install dependencies.
- sudo rosdep init
Expand All @@ -88,16 +88,16 @@ install:
# wstool looks for a ROSINSTALL_FILE defined in the environment variables.
before_script:
# source dependencies: install using wstool.
- ~/catkin_ws/src/auv/utils/setup.sh
- ~/catkin_ws/src/auv2016/utils/setup.sh

# Compile and test. If the CATKIN_OPTIONS file exists, use it as an argument to
# catkin_make.
script:
# compile all pkgs
- cd ~/catkin_ws
- src/auv/utils/build.sh
- src/auv2016/utils/build.sh
# Testing: Use both run_tests (to see the output) and test (to error out).
- catkin_make run_tests # This always returns 0, but looks pretty.
- catkin_make test # This will return non-zero if a test fails.
- sudo ln -s /usr/bin/doxypy /usr/local/bin/doxypy
- src/auv/utils/deploy_docs.sh
- src/auv2016/utils/deploy_docs.sh
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[![Build Status](https://travis-ci.org/AUV-IITK/auv.svg?branch=master)](https://travis-ci.org/AUV-IITK/auv)
[![Build Status](https://travis-ci.org/AUV-IITK/auv2016.svg?branch=master)](https://travis-ci.org/AUV-IITK/auv2016)

Under development. Like seriously.
4 changes: 2 additions & 2 deletions utils/build.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/bash
#
# This script compiles all the packages in auv repo.
# This script compiles all the packages in auv2016 repo.
# Only those packages that should not be build on odroid are build here; rest all go to odroid_build.sh
#
# change dir to workspace
(cd ~/catkin_ws &&
./src/auv/utils/odroid_build.sh &&
./src/auv2016/utils/odroid_build.sh &&
# build debug layer
catkin_make --pkg varun_description &&
catkin_make --pkg varun_gazebo &&
Expand Down
12 changes: 6 additions & 6 deletions utils/deploy_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

function doCompile {
~/catkin_ws/src/auv/utils/generate_docs.sh
~/catkin_ws/src/auv2016/utils/generate_docs.sh
}

# Pull requests and commits to other branches shouldn't try to deploy, just build to verify
Expand All @@ -16,20 +16,20 @@ fi

# Clone the existing gh-pages for this repo into html/
# Create a new empty branch if gh-pages doesn't exist yet (should only happen on first deply)
git clone "https://github.com/AUV-IITK/auv.git" ~/catkin_ws/src/auv/html/
cd ~/catkin_ws/src/auv/html/
git clone "https://github.com/AUV-IITK/auv2016.git" ~/catkin_ws/src/auv2016/html/
cd ~/catkin_ws/src/auv2016/html/

# Save some useful information
export SHA=`git rev-parse --verify HEAD`
git checkout -b gh-pages origin/gh-pages
cd ..
# Clean html/ existing contents except .git folder
rm -rf ~/catkin_ws/src/auv/html/*
rm -rf ~/catkin_ws/src/auv2016/html/*
# Run our compile script
echo "compile docs"
doCompile
# Now let's go have some fun with the cloned repo
cd ~/catkin_ws/src/auv/html/
cd ~/catkin_ws/src/auv2016/html/
echo "git config"
git config user.name "Shikher Verma"
git config user.email "[email protected]"
Expand All @@ -40,4 +40,4 @@ echo "git commit"
git commit -m "Deploy $SHA"

# Now that we're all set up, we can push.
git push -f -q https://ShikherVerma:$GH_TOKEN@github.com/AUV-IITK/auv.git gh-pages
git push -f -q https://ShikherVerma:$GH_TOKEN@github.com/AUV-IITK/auv2016.git gh-pages
4 changes: 2 additions & 2 deletions utils/generate_docs.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# This script generates documentation of all the packages in auv repo.
# This script generates documentation of all the packages in auv2016 repo.
#
(cd ~/catkin_ws/src/auv &&
(cd ~/catkin_ws/src/auv2016 &&
doxygen )
2 changes: 1 addition & 1 deletion utils/odroid_build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# This script compiles all the packages in auv repo except the ones not required on odroid.
# This script compiles all the packages in auv2016 repo except the ones not required on odroid.
#
# compiling individual pkgs is prefered because it helps maintain a list of all the pkgs
# xyz_commons folder contain actionlib files on which other pkgs depend, so they are
Expand Down
4 changes: 2 additions & 2 deletions utils/setup.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# This script downloads and installs all the dependencies of packages in auv repo.
# This script installs all the dependencies of packages in auv2016 repo.
#
ROS_DISTRO=$'indigo'

Expand Down Expand Up @@ -72,4 +72,4 @@ echo "Please add these to your ~/.bashrc file"
echo "source /opt/ros/$ROS_DISTRO/setup.sh"
echo "source /usr/share/gazebo-7/setup.sh"
echo "For using gazebosim on your system plz install by running #curl -ssL http://get.gazebosim.org | sh"
echo "and configure these settings #export GAZEBO_MODEL_PATH=$GAZEBO_MODEL_PATH/home/$USER/catkin_ws/src/auv/debug_layer/:/home/$USER/catkin_ws/src/auv/debug_layer/varun_gazebo/models/:"
echo "and configure these settings #export GAZEBO_MODEL_PATH=$GAZEBO_MODEL_PATH/home/$USER/catkin_ws/src/auv2016/debug_layer/:/home/$USER/catkin_ws/src/auv2016/debug_layer/varun_gazebo/models/:"

0 comments on commit 84e71f2

Please sign in to comment.