Skip to content

Commit 8ca178f

Browse files
committed
fix to update dpkg before starting script
1 parent f55e23c commit 8ca178f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ env:
2828
- USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=false NOT_TEST_INSTALL=true
2929
- USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=true EXTRA_DEB="ros-indigo-hrpsys-ros-bridge ros-indigo-pr2eus" CATKIN_PARALLEL_JOBS='-p4' NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST="true"
3030
- USE_JENKINS=true ROS_DISTRO=indigo USE_DEB=false EXTRA_DEB="ros-indigo-hrpsys-ros-bridge ros-indigo-pr2eus" ROS_PARALLEL_JOBS="-j1 -l1" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST="true"
31-
- USE_TRAVIS=true ROS_DISTRO=jade USE_DEB=true
3231
- USE_TRAVIS=true TEST_TYPE=work_with_downstream TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=indigo EXTRA_DEB="ros-indigo-roslint"
3332
- USE_TRAVIS=true TEST_TYPE=work_with_315_1_10 TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=indigo EXTRA_DEB="ros-indigo-roslint"
3433
- USE_TRAVIS=true TEST_TYPE=work_with_downstream TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=jade EXTRA_DEB="ros-jade-roslint"
@@ -40,6 +39,7 @@ matrix:
4039
- env: USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=true EXTRA_DEB="ros-indigo-hrpsys-ros-bridge ros-indigo-pr2eus" CATKIN_PARALLEL_JOBS='-p4' NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST="true"
4140
- env: USE_TRAVIS=true TEST_TYPE=work_with_downstream TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=jade EXTRA_DEB="ros-jade-roslint"
4241
- env: USE_TRAVIS=true TEST_TYPE=work_with_315_1_10 TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=jade EXTRA_DEB="ros-jade-roslint"
42+
- env: USE_TRAVIS=true ROS_DISTRO=jade USE_DEB=true
4343
notifications:
4444
email:
4545
recipients:
@@ -51,6 +51,7 @@ before_script:
5151
- set -x
5252
- 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
5353
- export REPOSITORY_NAME=`basename $PWD`
54+
- if [ "${ROS_DISTRO}" == "indigo" -o "${ROS_DISTRO}" == "jade" ] ; then sudo apt-get install -y --force-yes dpkg; fi
5455
- if [ "${INSTALL_SRC}" != "" ] ;then export sudo apt-get install python-yaml; export BEFORE_SCRIPT="$(for src in $INSTALL_SRC; do name=`basename $src`; echo "python -c \"import yaml;print yaml.dump([{\\\"git\\\":{\\\"uri\\\":\\\"$src\\\",\\\"local-name\\\":\\\"$name\\\"}}], default_flow_style=False)\" >> .rosinstall;"; done)ls -al; cat .rosinstall; wstool update"; export USE_DEB=false; fi; # set USE_DEB false to enable .travis.rosinstall
5556
script:
5657
- if [ "${IS_EUSLISP_TRAVIS_TEST}" != "true" ] ; then export ROS_PARALLEL_JOBS="-j2 -l2" ; fi

0 commit comments

Comments
 (0)