diff --git a/.travis.yml b/.travis.yml index d4ef5e79..2335e663 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ sudo: required language: generic +cache: + directories: + - $(pwd)/image/ services: - docker env: global: - - DOCKER=smirart/builder + - DOCKER=smirart/builder:latest #- TARGET_REPO=$(dhdhdhjdjdjdhrhd) # https://docs.travis-ci.com/user/environment-variables # REGISTRY_PASS=... @@ -19,16 +22,14 @@ after_failure: - skip_deploy before_deploy: - provider: script - script: echo 'before deploy' + - echo 'before deploy' #- zip #- size #- Sha256 #- Upload deploy: - provider: script - script: echo 'github release measage' + - echo 'github release measage' # https://docs.travis-ci.com/user/build-stages/deploy-github-releases/ #provider: releases # api_key: $GITHUB_OAUTH_TOKEN diff --git a/image_builder/scripts/ros_install.sh b/image_builder/scripts/ros_install.sh index ef476f19..8cf5ac62 100755 --- a/image_builder/scripts/ros_install.sh +++ b/image_builder/scripts/ros_install.sh @@ -83,7 +83,7 @@ if [ "${INSTALL_ROS_PACK_SOURCES}" = "True" ]; then || (echo_stamp "Some CLEVER sources installation was failed!" "ERROR"; exit 1) fi - resolve_rosdep + resolve_rosdep '/home/pi/ros_catkin_ws' # TODO: Add refactor to origin repo #echo_stamp "Refactoring usb_cam in SRC" @@ -119,7 +119,8 @@ echo_stamp "#12 Creating catkin_ws & Installing CLEVER-BUNDLE" \ && pip install wheel \ && cd /home/pi/catkin_ws \ && resolve_rosdep $(pwd) \ - && . /opt/ros/kinetic/setup.sh \ + && ls -l /opt/ros/kinetic \ + && source /opt/ros/kinetic/setup.bash \ && catkin_make -j$5 -DCMAKE_BUILD_TYPE=Release \ && ln -s /home/pi/catkin_ws/src/clever/deploy/roscore.service /lib/systemd/system/roscore.service \ && ln -s /home/pi/catkin_ws/src/clever/deploy/clever.service /lib/systemd/system/clever.service \