From 2d7d46a7d2d263c1e08df796a75ee326b5f38e81 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Sat, 12 Sep 2015 13:38:52 +0900 Subject: [PATCH] Update jsk_travis --- .travis | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis b/.travis index 59d30120b..5da62efe1 160000 --- a/.travis +++ b/.travis @@ -1 +1 @@ -Subproject commit 59d30120bbd22f561eea977071407fca92c3b75f +Subproject commit 5da62efe14fb166a6c585875c265ac3ba68f48f0 diff --git a/.travis.yml b/.travis.yml index e3c081377..b5e4e4719 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ before_script: - set -x - 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 .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)" >> .rosinstall; done; cat .rosinstall; export USE_DEB=false; fi; # set USE_DEB false to enable .rosinstall + - 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: