From 8e3b01979382cd1337629a6250b8db2a2f71e7ac Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sun, 27 Sep 2015 14:16:28 +0900 Subject: [PATCH 1/2] .travis.yml: re-enable jade and hydro with released deb --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24a647ccb..7f4d7e3d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,9 +34,9 @@ env: - ROS_DISTRO=jade USE_DEB=source TEST_PKGS="roseus roseus_smach" NOT_TEST_INSTALL=true matrix: allow_failures: - - env: ROS_DISTRO=hydro USE_DEB=true ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu - - env: ROS_DISTRO=jade USE_DEB=true TEST_PKGS="roseus roseus_smach" NOT_TEST_INSTALL=true - - env: ROS_DISTRO=jade USE_DEB=true ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu TEST_PKGS="roseus roseus_smach" NOT_TEST_INSTALL=true +# - env: ROS_DISTRO=hydro USE_DEB=true ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu +# - env: ROS_DISTRO=jade USE_DEB=true TEST_PKGS="roseus roseus_smach" NOT_TEST_INSTALL=true +# - env: ROS_DISTRO=jade USE_DEB=true ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu TEST_PKGS="roseus roseus_smach" NOT_TEST_INSTALL=true # - env: ROS_DISTRO=hydro ROSWS=wstool BUILDER=catkin USE_DEB=false # - env: ROS_DISTRO=indigo ROSWS=wstool BUILDER=catkin USE_DEB=true # - env: ROS_DISTRO=indigo ROSWS=wstool BUILDER=catkin USE_DEB=false From 48c719bc81fcdafb3e5121ed59dba6e0f1314e1c Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sun, 27 Sep 2015 14:34:35 +0900 Subject: [PATCH 2/2] on master branch INSTALL_SRC was set on TRAVIS_SECURE_ENV_VERS==ture condition, see https://github.com/jsk-ros-pkg/jsk_roseus/pull/375#issuecomment-143521075 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7f4d7e3d0..395da5b0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,9 +42,9 @@ matrix: # - env: ROS_DISTRO=indigo ROSWS=wstool BUILDER=catkin USE_DEB=false before_script: - set -x + - if [ "${INSTALL_SRC}" != "" ] ;then sudo apt-get install python-yaml; rm .travis.rosinstall; for src in $INSTALL_SRC; do name=`basename $src`; python -c "import yaml;print yaml.dump([{'git':{'uri':'$src','local-name':'$name'}}], default_flow_style=False)" >> .travis.rosinstall; done; cat .travis.rosinstall; export USE_DEB=false; fi; # set USE_DEB false to enable .travis.rosinstall - if [ "${TRAVIS_SECURE_ENV_VARS}" == "true" ]; then openssl aes-256-cbc -K $encrypted_b79fc5843df3_key -iv $encrypted_b79fc5843df3_iv -in .secrets.tar.enc -out .secrets.tar -d; tar -C ~/ -xvf .secrets.tar; export INSTALL_SRC="$INSTALL_SRC $INSTALL_SRC_SECURE"; export TEST_PKGS="$TEST_PKGS $TEST_PKGS_SECURE"; fi - export REPOSITORY_NAME=`basename $PWD` - - if [ "${INSTALL_SRC}" != "" ] ;then sudo apt-get install python-yaml; rm .travis.rosinstall; for src in $INSTALL_SRC; do name=`basename $src`; python -c "import yaml;print yaml.dump([{'git':{'uri':'$src','local-name':'$name'}}], default_flow_style=False)" >> .travis.rosinstall; done; cat .travis.rosinstall; export USE_DEB=false; fi; # set USE_DEB false to enable .travis.rosinstall script: - .travis/travis.sh after_success: