diff --git a/.github/workflows/hironx.yml b/.github/workflows/hironx.yml
new file mode 100644
index 000000000..a969c345f
--- /dev/null
+++ b/.github/workflows/hironx.yml
@@ -0,0 +1,51 @@
+on: [push, pull_request]
+
+jobs:
+ indigo:
+ runs-on: ubuntu-latest
+ name: ${{ matrix.name }}
+
+ container: ${{ matrix.container }}
+
+ strategy:
+ matrix:
+ include:
+ - name: indigo-work_with_downstream
+ ROS_DISTRO: indigo
+ container: jskrobotics/ros-ubuntu:14.04
+ EXTRA_DEB: 'ros-indigo-roslint'
+ TEST_TYPE: work_with_downstream
+ - name: indigo-work_with_315_1_10
+ ROS_DISTRO: indigo
+ container: jskrobotics/ros-ubuntu:14.04
+ EXTRA_DEB: 'ros-indigo-roslint'
+ TEST_TYPE: work_with_315_1_10
+ - name: melodic-work_with_downstream
+ ROS_DISTRO: melodic
+ container: jskrobotics/ros-ubuntu:18.04
+ EXTRA_DEB: 'ros-melodic-roslint'
+ TEST_TYPE: work_with_downstream
+ - name: melodic-work_with_315_1_10
+ ROS_DISTRO: melodic
+ container: jskrobotics/ros-ubuntu:18.04
+ EXTRA_DEB: 'ros-melodic-roslint'
+ TEST_TYPE: work_with_315_1_10
+
+ steps:
+ - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
+ run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
+ - name: Before Checkout # need for actions/checkout with ros-ubuntu container
+ run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Run jsk_travis
+ run: source ./.travis_test.sh
+ shell: bash
+ env:
+ ROS_DISTRO : ${{ matrix.ROS_DISTRO }}
+ CATKIN_PARALLEL_JOBS: '-p2'
+ CATKIN_PARALLEL_TEST_JOBS: '-p1'
+ ROS_PARALLEL_TEST_JOBS: '-j1'
+ TEST_PACKAGE: 'hironx-ros-bridge'
+ EXTRA_DEB: ${{ matrix.EXTRA_DEB }}
+ TEST_TYPE : ${{ matrix.TEST_TYPE }}
diff --git a/.github/workflows/indigo.yml b/.github/workflows/indigo.yml
new file mode 100644
index 000000000..da35f92af
--- /dev/null
+++ b/.github/workflows/indigo.yml
@@ -0,0 +1,69 @@
+# generated by `./generate_action_config.py indigo`
+# jsk_travis
+on: [push, pull_request]
+
+jobs:
+ indigo:
+ runs-on: ubuntu-latest
+ name: ${{ matrix.name }}
+ continue-on-error: ${{ matrix.continue-on-error }}
+
+ container: jskrobotics/ros-ubuntu:14.04
+
+ strategy:
+ matrix:
+ include:
+ - name: indigo
+ continue-on-error: true
+ USE_DEB: true
+ NOT_TEST_INSTALL: false
+ TEST_PKGS: 'hrpsys_tools openrtm_tools rosnode_rtc rtmbuild hrpsys_ros_bridge openrtm_ros_bridge'
+ EXTRA_DEB: ''
+ ADDITIONAL_ENV_TO_DOCKER: ''
+ IS_EUSLISP_TRAVIS_TEST: false
+ - name: indigo-src
+ continue-on-error: false
+ USE_DEB: false
+ NOT_TEST_INSTALL: true
+ TEST_PKGS: 'hrpsys_tools openrtm_tools rosnode_rtc rtmbuild hrpsys_ros_bridge openrtm_ros_bridge'
+ EXTRA_DEB: ''
+ ADDITIONAL_ENV_TO_DOCKER: ''
+ IS_EUSLISP_TRAVIS_TEST: false
+ - name: indigo-eustest
+ continue-on-error: true
+ USE_DEB: true
+ NOT_TEST_INSTALL: false
+ TEST_PKGS: 'hrpsys_ros_bridge'
+ EXTRA_DEB: 'ros-indigo-hrpsys-ros-bridge ros-indigo-pr2eus'
+ ADDITIONAL_ENV_TO_DOCKER: 'IS_EUSLISP_TRAVIS_TEST'
+ IS_EUSLISP_TRAVIS_TEST: true
+ - name: indigo-src-eustest
+ continue-on-error: false
+ USE_DEB: false
+ NOT_TEST_INSTALL: true
+ TEST_PKGS: 'hrpsys_ros_bridge'
+ EXTRA_DEB: 'ros-indigo-hrpsys-ros-bridge ros-indigo-pr2eus'
+ ADDITIONAL_ENV_TO_DOCKER: 'IS_EUSLISP_TRAVIS_TEST'
+ IS_EUSLISP_TRAVIS_TEST: true
+
+ steps:
+ - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
+ run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
+ - name: Before Checkout # need for actions/checkout with ros-ubuntu container
+ run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Run jsk_travis
+ uses: jsk-ros-pkg/jsk_travis@master
+ with:
+ ROS_DISTRO : indigo
+ CATKIN_PARALLEL_JOBS: '-p1'
+ CATKIN_PARALLEL_TEST_JOBS: '-p1'
+ ROS_PARALLEL_JOBS: "-j1"
+ ROS_PARALLEL_TEST_JOBS: '-j1'
+ USE_DEB: ${{ matrix.USE_DEB }}
+ NOT_TEST_INSTALL: ${{ matrix.NOT_TEST_INSTALL }}
+ TEST_PKGS: ${{ matrix.TEST_PKGS }}
+ EXTRA_DEB: ${{ matrix.EXTRA_DEB }}
+ ADDITIONAL_ENV_TO_DOCKER: ${{ matrix.ADDITIONAL_ENV_TO_DOCKER }}
+ IS_EUSLISP_TRAVIS_TEST: ${{ matrix.IS_EUSLISP_TRAVIS_TEST }}
diff --git a/.github/workflows/kinetic.yml b/.github/workflows/kinetic.yml
new file mode 100644
index 000000000..a56902166
--- /dev/null
+++ b/.github/workflows/kinetic.yml
@@ -0,0 +1,84 @@
+# generated by `./generate_action_config.py kinetic`
+# jsk_travis
+on: [push, pull_request]
+
+jobs:
+ kinetic:
+ runs-on: ubuntu-latest
+ name: ${{ matrix.name }}
+ continue-on-error: ${{ matrix.continue-on-error }}
+
+ container: jskrobotics/ros-ubuntu:16.04
+
+ strategy:
+ matrix:
+ include:
+ - name: kinetic
+ continue-on-error: true
+ USE_DEB: true
+ NOT_TEST_INSTALL: false
+ TEST_PKGS: 'hrpsys_tools openrtm_tools rosnode_rtc rtmbuild hrpsys_ros_bridge openrtm_ros_bridge'
+ EXTRA_DEB: ''
+ ADDITIONAL_ENV_TO_DOCKER: ''
+ IS_EUSLISP_TRAVIS_TEST: false
+ - name: kinetic-src
+ continue-on-error: false
+ # Install libopencv-dev manually to compile hrpsys-simulator in hrpsys-base on kinetic
+ # Details: https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611457804
+ # https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611476618
+ USE_DEB: false
+ NOT_TEST_INSTALL: true
+ TEST_PKGS: 'hrpsys_tools openrtm_tools rosnode_rtc rtmbuild hrpsys_ros_bridge openrtm_ros_bridge'
+ EXTRA_DEB: 'libopencv-dev'
+ ADDITIONAL_ENV_TO_DOCKER: ''
+ IS_EUSLISP_TRAVIS_TEST: false
+ - name: kinetic-eustest
+ continue-on-error: true
+ USE_DEB: true
+ NOT_TEST_INSTALL: false
+ TEST_PKGS: 'hrpsys_ros_bridge'
+ EXTRA_DEB: 'ros-kinetic-hrpsys-ros-bridge ros-kinetic-pr2eus'
+ ADDITIONAL_ENV_TO_DOCKER: 'IS_EUSLISP_TRAVIS_TEST'
+ IS_EUSLISP_TRAVIS_TEST: true
+ - name: kinetic-src-eustest
+ continue-on-error: false
+ # Install libopencv-dev manually to compile hrpsys-simulator in hrpsys-base on kinetic
+ # Details: https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611457804
+ # https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611476618
+ USE_DEB: false
+ NOT_TEST_INSTALL: true
+ TEST_PKGS: 'hrpsys_ros_bridge'
+ EXTRA_DEB: 'libopencv-dev ros-kinetic-hrpsys-ros-bridge ros-kinetic-pr2eus'
+ ADDITIONAL_ENV_TO_DOCKER: 'IS_EUSLISP_TRAVIS_TEST'
+ IS_EUSLISP_TRAVIS_TEST: true
+ - name: kinetic-src-with-libopenni2-dev-libpcl-dev
+ continue-on-error: false
+ # To catch https://github.com/start-jsk/rtmros_common/pull/1090#issuecomment-610860446
+ USE_DEB: false
+ NOT_TEST_INSTALL: true
+ TEST_PKGS: 'hrpsys_tools openrtm_tools rosnode_rtc rtmbuild hrpsys_ros_bridge openrtm_ros_bridge'
+ EXTRA_DEB: 'libopencv-dev libopenni2-dev libpcl-dev'
+ ADDITIONAL_ENV_TO_DOCKER: ''
+ IS_EUSLISP_TRAVIS_TEST: false
+
+ steps:
+ - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
+ run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
+ - name: Before Checkout # need for actions/checkout with ros-ubuntu container
+ run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Run jsk_travis
+ uses: jsk-ros-pkg/jsk_travis@master
+ with:
+ ROS_DISTRO : kinetic
+ CATKIN_PARALLEL_JOBS: '-p1'
+ CATKIN_PARALLEL_TEST_JOBS: '-p1'
+ ROS_PARALLEL_JOBS: "-j1"
+ ROS_PARALLEL_TEST_JOBS: '-j1'
+ USE_DEB: ${{ matrix.USE_DEB }}
+ NOT_TEST_INSTALL: ${{ matrix.NOT_TEST_INSTALL }}
+ TEST_PKGS: ${{ matrix.TEST_PKGS }}
+ EXTRA_DEB: ${{ matrix.EXTRA_DEB }}
+ ADDITIONAL_ENV_TO_DOCKER: ${{ matrix.ADDITIONAL_ENV_TO_DOCKER }}
+ IS_EUSLISP_TRAVIS_TEST: ${{ matrix.IS_EUSLISP_TRAVIS_TEST }}
diff --git a/.github/workflows/melodic.yml b/.github/workflows/melodic.yml
new file mode 100644
index 000000000..cfc60c924
--- /dev/null
+++ b/.github/workflows/melodic.yml
@@ -0,0 +1,75 @@
+# generated by `./generate_action_config.py melodic`
+# jsk_travis
+on: [push, pull_request]
+
+jobs:
+ melodic:
+ runs-on: ubuntu-latest
+ name: ${{ matrix.name }}
+ continue-on-error: ${{ matrix.continue-on-error }}
+
+ container: jskrobotics/ros-ubuntu:18.04
+
+ strategy:
+ matrix:
+ include:
+ - name: melodic
+ continue-on-error: true
+ USE_DEB: true
+ NOT_TEST_INSTALL: false
+ CATKIN_TOOLS_BUILD_OPTIONS: '-iv --summarize --no-status'
+ TEST_PKGS: 'hrpsys_tools openrtm_tools rosnode_rtc rtmbuild hrpsys_ros_bridge openrtm_ros_bridge'
+ EXTRA_DEB: ''
+ ADDITIONAL_ENV_TO_DOCKER: ''
+ IS_EUSLISP_TRAVIS_TEST: false
+ - name: melodic-src
+ continue-on-error: false
+ USE_DEB: false
+ NOT_TEST_INSTALL: true
+ CATKIN_TOOLS_BUILD_OPTIONS: '-iv --summarize --no-status --make-args -Wno-deprecated --' # otherwise hrpsys and openhrp3 output too many warnings.
+ TEST_PKGS: 'hrpsys_tools openrtm_tools rosnode_rtc rtmbuild hrpsys_ros_bridge openrtm_ros_bridge'
+ EXTRA_DEB: ''
+ ADDITIONAL_ENV_TO_DOCKER: ''
+ IS_EUSLISP_TRAVIS_TEST: false
+ - name: melodic-eustest
+ continue-on-error: true
+ USE_DEB: true
+ NOT_TEST_INSTALL: false
+ CATKIN_TOOLS_BUILD_OPTIONS: '-iv --summarize --no-status'
+ TEST_PKGS: 'hrpsys_ros_bridge'
+ EXTRA_DEB: 'ros-melodic-hrpsys-ros-bridge ros-melodic-pr2eus'
+ ADDITIONAL_ENV_TO_DOCKER: 'IS_EUSLISP_TRAVIS_TEST'
+ IS_EUSLISP_TRAVIS_TEST: true
+ - name: melodic-src-eustest
+ continue-on-error: false
+ USE_DEB: false
+ NOT_TEST_INSTALL: true
+ CATKIN_TOOLS_BUILD_OPTIONS: '-iv --summarize --no-status --make-args -Wno-deprecated --' # otherwise hrpsys and openhrp3 output too many warnings.
+ TEST_PKGS: 'hrpsys_ros_bridge'
+ EXTRA_DEB: 'ros-melodic-hrpsys-ros-bridge ros-melodic-pr2eus'
+ ADDITIONAL_ENV_TO_DOCKER: 'IS_EUSLISP_TRAVIS_TEST'
+ IS_EUSLISP_TRAVIS_TEST: true
+
+
+ steps:
+ - name: Install latest git ( use sudo for ros-ubuntu, remove sudo for ubuntu container), checkout@v2 uses REST API for git<2.18, which removes .git folder and does not checkout .travis submodules
+ run: sudo apt-get update && sudo apt-get install -y software-properties-common && sudo apt-get update && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git
+ - name: Before Checkout # need for actions/checkout with ros-ubuntu container
+ run: sudo chown -R user:jenkins $RUNNER_WORKSPACE $HOME
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Run jsk_travis
+ uses: jsk-ros-pkg/jsk_travis@master
+ with:
+ ROS_DISTRO : melodic
+ CATKIN_PARALLEL_JOBS: '-p1'
+ CATKIN_PARALLEL_TEST_JOBS: '-p1'
+ ROS_PARALLEL_JOBS: "-j1"
+ ROS_PARALLEL_TEST_JOBS: '-j1'
+ USE_DEB: ${{ matrix.USE_DEB }}
+ NOT_TEST_INSTALL: ${{ matrix.NOT_TEST_INSTALL }}
+ CATKIN_TOOLS_BUILD_OPTIONS: ${{ matrix.CATKIN_TOOLS_BUILD_OPTIONS }}
+ TEST_PKGS: ${{ matrix.TEST_PKGS }}
+ EXTRA_DEB: ${{ matrix.EXTRA_DEB }}
+ ADDITIONAL_ENV_TO_DOCKER: ${{ matrix.ADDITIONAL_ENV_TO_DOCKER }}
+ IS_EUSLISP_TRAVIS_TEST: ${{ matrix.IS_EUSLISP_TRAVIS_TEST }}
diff --git a/.travis b/.travis
index 54cfece8b..0955a49eb 160000
--- a/.travis
+++ b/.travis
@@ -1 +1 @@
-Subproject commit 54cfece8bf0ab09877f00070a64a93fc507b68e7
+Subproject commit 0955a49eb558dbcc8f25c032668ad25774c41a8b
diff --git a/.travis.rosinstall b/.travis.rosinstall
index 09f5eda5f..4783acd89 100644
--- a/.travis.rosinstall
+++ b/.travis.rosinstall
@@ -9,10 +9,11 @@
### latest source is checked with use_deb==source, so we're ok with released source in here
###
- git:
- uri: https://github.com/tork-a/openhrp3-release
+ uri: https://github.com/Naoki-Hiraoka/openhrp3
local-name: openhrp3
+ version: for-travis
- git:
- uri: https://github.com/tork-a/hrpsys-release
+ uri: https://github.com/fkanehiro/hrpsys-base
local-name: hrpsys
# - git:
# uri: https://github.com/tork-a/rtshell-release
diff --git a/.travis.rosinstall.kinetic b/.travis.rosinstall.kinetic
index 4d4444529..e69de29bb 100644
--- a/.travis.rosinstall.kinetic
+++ b/.travis.rosinstall.kinetic
@@ -1,17 +0,0 @@
-- git:
- uri: https://github.com/tork-a/openhrp3-release
- version: release/kinetic/openhrp3
- local-name: openhrp3
-# We want to use source of released hrpsys, but building it fails when libpcl-dev and libopenni2-dev exist.
-# Waiting for https://github.com/fkanehiro/hrpsys-base/pull/1242 to be released.
-# Details: https://github.com/start-jsk/rtmros_common/pull/1090#issuecomment-610860446
-# Don't forget to remove libopencv-dev installation from .travis.yml and README when using hrpsys-release again.
-# Details: https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611457804
-# - git:
-# uri: https://github.com/tork-a/hrpsys-release
-# version: release/kinetic/hrpsys
-# local-name: hrpsys
-- git:
- uri: https://github.com/fkanehiro/hrpsys-base
- version: master
- local-name: hrpsys
diff --git a/.travis.rosinstall.melodic b/.travis.rosinstall.melodic
index 0dd96e466..e69de29bb 100644
--- a/.travis.rosinstall.melodic
+++ b/.travis.rosinstall.melodic
@@ -1,8 +0,0 @@
-- git:
- uri: https://github.com/tork-a/openhrp3-release
- version: release/melodic/openhrp3
- local-name: openhrp3
-- git:
- uri: https://github.com/fkanehiro/hrpsys-base
- version: master
- local-name: hrpsys
diff --git a/.travis.yml b/.travis.yml
index ff2f94143..0e26942a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,15 @@
# Works with all MoveIt! repositories/branches
# Author: Dave Coleman, Jonathan Bohren
sudo: required
-dist: trusty
+dist: bionic
language: c++
cache:
- - ccache
- - apt
+ apt: true
+ pip: true
+ directories:
+ - $HOME/.ccache
+ - $HOME/.cache/pip
+ - $HOME/apt-cacher-ng
env:
global:
- ROSWS=wstool
@@ -18,25 +22,25 @@ env:
- ADDITIONAL_ENV_TO_DOCKER='IS_EUSLISP_TRAVIS_TEST'
- secure: "QxLoOR83QHxGdMJ3BJ0TwRJdezWZaiWfoe4O88XMSG8LFMZLRbqNmOsrLn9b/VgMQpz44CP7tXXQvNz0FDRSTpgSdyNT+p1UA7iEhFYI4G3OEsYf0r6/4rjvtM7FCoIsBiPYBwofVAUP+U9d8Scjn+2+xjjKwOpEbaE/yc+zwrc="
matrix:
- - USE_JENKINS=true ROS_DISTRO=hydro USE_DEB=true
+ - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=hydro USE_DEB=true
- USE_JENKINS=true ROS_DISTRO=hydro USE_DEB=false NOT_TEST_INSTALL=true
- USE_JENKINS=true ROS_DISTRO=hydro USE_DEB=source NOT_TEST_INSTALL=true EXTRA_DEB="ros-hydro-roseus ros-hydro-euscollada ros-hydro-pr2eus" ROS_PARALLEL_JOBS="-j1 -l1" IS_EUSLISP_TRAVIS_TEST="true"
- USE_JENKINS=true ROS_DISTRO=hydro USE_DEB=source NOT_TEST_INSTALL=true
- - USE_JENKINS=true ROS_DISTRO=hydro USE_DEB=true EXTRA_DEB="ros-hydro-hrpsys-ros-bridge ros-hydro-pr2eus" ROS_PARALLEL_JOBS="-j1 -l1" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST="true"
+ - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=hydro USE_DEB=true EXTRA_DEB="ros-hydro-hrpsys-ros-bridge ros-hydro-pr2eus" ROS_PARALLEL_JOBS="-j1 -l1" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST="true"
- USE_JENKINS=true ROS_DISTRO=hydro USE_DEB=false EXTRA_DEB="ros-hydro-hrpsys-ros-bridge ros-hydro-pr2eus" ROS_PARALLEL_JOBS="-j1 -l1" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST="true"
- - USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=true
- - USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=false NOT_TEST_INSTALL=true
- - USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=true EXTRA_DEB="ros-indigo-hrpsys-ros-bridge ros-indigo-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
+ - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=indigo USE_DEB=true
+ - USE_JENKINS=true ROS_DISTRO=indigo USE_DEB=false NOT_TEST_INSTALL=true
+ - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=indigo USE_DEB=true EXTRA_DEB="ros-indigo-hrpsys-ros-bridge ros-indigo-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
- USE_JENKINS=true ROS_DISTRO=indigo USE_DEB=false EXTRA_DEB="ros-indigo-hrpsys-ros-bridge ros-indigo-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
- - USE_TRAVIS=true TEST_TYPE=work_with_downstream TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=indigo EXTRA_DEB="ros-indigo-roslint"
- - USE_TRAVIS=true TEST_TYPE=work_with_315_1_10 TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=indigo EXTRA_DEB="ros-indigo-roslint"
- - USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=true EXTRA_DEB="ros-indigo-pr2eus" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST=false # For updating euslisp-docs (Must be USE_TRAVIS=true and IS_EUSLISP_TRAVIS_TEST=false. See after_success)
- - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=true
+ - USE_JENKINS=true TEST_TYPE=work_with_downstream TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=indigo EXTRA_DEB="ros-indigo-roslint"
+ - USE_JENKINS=true TEST_TYPE=work_with_315_1_10 TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=indigo EXTRA_DEB="ros-indigo-roslint"
+ - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=indigo USE_DEB=true EXTRA_DEB="ros-indigo-pr2eus" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST=false # For updating euslisp-docs (Must be USE_TRAVIS=true and IS_EUSLISP_TRAVIS_TEST=false. See after_success)
+ - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=kinetic USE_DEB=true
- USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=false NOT_TEST_INSTALL=true
- USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=false EXTRA_DEB="libopenni2-dev libpcl-dev" NOT_TEST_INSTALL=true # To catch https://github.com/start-jsk/rtmros_common/pull/1090#issuecomment-610860446
- - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=true EXTRA_DEB="ros-kinetic-hrpsys-ros-bridge ros-kinetic-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
+ - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=kinetic USE_DEB=true EXTRA_DEB="ros-kinetic-hrpsys-ros-bridge ros-kinetic-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
- USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=false EXTRA_DEB="ros-kinetic-hrpsys-ros-bridge ros-kinetic-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
- - USE_JENKINS=true ROS_DISTRO=melodic USE_DEB=true
+ - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=melodic USE_DEB=true
- USE_JENKINS=true ROS_DISTRO=melodic USE_DEB=false NOT_TEST_INSTALL=true BEFORE_SCRIPT="pwd; sed -i \"35iadd_definitions(-Wno-deprecated)\" hrpsys/CMakeLists.txt openhrp3/CMakeLists.txt; (cd hrpsys; git diff)"
matrix:
fast_finish: true
@@ -76,7 +80,9 @@ before_script:
script:
- if [ "${IS_EUSLISP_TRAVIS_TEST}" != "true" ] ; then export ROS_PARALLEL_JOBS="-j2 -l2" ; fi
- if [ "${ROS_DISTRO}" == "hydro" ] ; then sudo apt-get install -y --force-yes gdebi && wget https://bintray.com/artifact/download/furushchev/ros-shadow-fixed/python-catkin-tools_0.3.1-1_all.deb && wget https://bintray.com/artifact/download/furushchev/ros-shadow-fixed/python-catkin-pkg_0.2.10-1_all.deb && sudo gdebi -n -q python-catkin-pkg_0.2.10-1_all.deb && sudo gdebi -n -q python-catkin-tools_0.3.1-1_all.deb && sudo apt-mark hold python-catkin-tools; fi
- - if [ "${TEST_TYPE}" == "" ] ; then source .travis/travis.sh; else source ./.travis_test.sh ; fi
+ - if [ "${TEST_TYPE}" == "" ] ; then source .travis/travis.sh; fi
+ - if [ "${TEST_TYPE}" != "" ] ; then case $ROS_DISTRO in "hydro") export DISTRO=precise;; "indigo") export DISTRO=trusty;; "kinetic") export DISTRO=xenial;; "melodic") export DISTRO=bionic;; esac; fi
+ - if [ "${TEST_TYPE}" != "" ] ; then docker run -v $HOME:$HOME -e CI_SOURCE_PATH -e HOME -e ROS_DISTRO -e TEST_TYPE -e TEST_PACKAGE -e EXTRA_DEB -e ROS_PARALLEL_JOBS ubuntu:$DISTRO bash -c 'cd $CI_SOURCE_PATH; source ./.travis_test.sh'; fi
- ccache -s
after_success:
- if [ "${TRAVIS_SECURE_ENV_VARS}" == "true" ]; then cd ${TRAVIS_BUILD_DIR}; 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; fi
diff --git a/.travis_test.sh b/.travis_test.sh
index b6702f133..861a8b686 100644
--- a/.travis_test.sh
+++ b/.travis_test.sh
@@ -22,7 +22,7 @@ export CI_SOURCE_PATH=$(pwd)
export REPOSITORY_NAME=${PWD##*/}
if [ ! "$ROS_PARALLEL_JOBS" ]; then export ROS_PARALLEL_JOBS="-j8 -l8"; fi
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
-sudo sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros-latest.list'
+sudo sh -c 'echo "deb http://packages.ros.org/ros-testing/ubuntu `lsb_release -cs` 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 --force-yes -q -qq dpkg # https://github.com/travis-ci/travis-ci/issues/9361#issuecomment-408431262 dpkg-deb: error: archive has premature member 'control.tar.xz' before 'control.tar.gz' #9361
@@ -54,6 +54,7 @@ if [ "$TEST_TYPE" == "work_with_downstream" ]; then
sudo dpkg -r --force-depends ros-$ROS_DISTRO-rtmbuild
# https://github.com/start-jsk/rtmros_hironx/issues/287
sudo sed -i s@test_tf_and_controller@_test_tf_and_controller@ /opt/ros/$ROS_DISTRO/share/hironx_ros_bridge/test/test_hironx_ros_bridge.py
+ sudo sed -i "41i " /opt/ros/$ROS_DISTRO/share/hironx_ros_bridge/launch/hironx_ros_bridge.launch
catkin_make $ROS_PARALLEL_JOBS
catkin_make install $ROS_PARALLEL_JOBS
else
@@ -65,7 +66,7 @@ else
# set up sorce code of downstream package
cd src
wstool init
- wstool set rtmros_hironx http://github.com/start-jsk/rtmros_hironx --git -y
+ wstool set rtmros_hironx http://github.com/Naoki-Hiraoka/rtmros_hironx --git -y -v update-travis
wstool set rtmros_nextage http://github.com/tork-a/rtmros_nextage --git -y
wstool update
cd ..
diff --git a/hrpsys_ros_bridge/scripts/default_robot_ros_bridge.launch.in b/hrpsys_ros_bridge/scripts/default_robot_ros_bridge.launch.in
index abac00389..4dac51387 100644
--- a/hrpsys_ros_bridge/scripts/default_robot_ros_bridge.launch.in
+++ b/hrpsys_ros_bridge/scripts/default_robot_ros_bridge.launch.in
@@ -17,6 +17,7 @@
+
@@ -25,6 +26,7 @@
+
diff --git a/rtmbuild/cmake/rtmbuild.cmake b/rtmbuild/cmake/rtmbuild.cmake
index b6c983974..ed87ff954 100644
--- a/rtmbuild/cmake/rtmbuild.cmake
+++ b/rtmbuild/cmake/rtmbuild.cmake
@@ -137,7 +137,7 @@ macro(rtmbuild_init)
rosbuild_gensrv()
endif()
- include_directories(${catkin_INCLUDE_DIRS} ${openrtm_aist_INCLUDE_DIRS} ${openhrp3_INCLUDE_DIRS})
+ include_directories( ${openhrp3_INCLUDE_DIRS} ${openrtm_aist_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
# since catkin > 0.7.0, the CPATH is no longer being set by catkin, so rtmbuild manually add them
set(_cmake_prefix_path_tmp $ENV{CMAKE_PREFIX_PATH})
string(REPLACE ":" ";" _cmake_prefix_path_tmp ${_cmake_prefix_path_tmp})
@@ -145,7 +145,7 @@ macro(rtmbuild_init)
include_directories(${_cmake_prefix_path}/include)
endforeach()
- link_directories(${catkin_LIBRARY_DIRS} ${openrtm_aist_LIBRARY_DIRS} ${openhrp3_LIBRARY_DIRS})
+ link_directories(${openhrp3_LIBRARY_DIRS} ${openrtm_aist_LIBRARY_DIRS} ${catkin_LIBRARY_DIRS})
endmacro(rtmbuild_init)
@@ -308,7 +308,7 @@ macro(rtmbuild_add_executable exe)
set_target_properties(${exe} PROPERTIES COMPILE_FLAGS "-Wno-deprecated")
##
add_dependencies(${exe} RTMBUILD_${PROJECT_NAME}_genbridge ${${_package}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} )
- target_link_libraries(${exe} ${catkin_LIBRARIES} ${openrtm_aist_LIBRARIES} ${openhrp3_LIBRARIES} ${${PROJECT_NAME}_IDLLIBRARY_DIRS} )
+ target_link_libraries(${exe} ${openhrp3_LIBRARIES} ${${PROJECT_NAME}_IDLLIBRARY_DIRS} ${openrtm_aist_LIBRARIES} ${catkin_LIBRARIES} )
endmacro(rtmbuild_add_executable)
macro(rtmbuild_add_library lib)
@@ -318,6 +318,6 @@ macro(rtmbuild_add_library lib)
else()
rosbuild_add_library(${ARGV})
endif()
- target_link_libraries(${lib} ${openrtm_aist_LIBRARIES} ${openhrp3_LIBRARIES} ${${PROJECT_NAME}_IDLLIBRARY_DIRS})
+ target_link_libraries(${lib} ${openhrp3_LIBRARIES} ${openrtm_aist_LIBRARIES} ${${PROJECT_NAME}_IDLLIBRARY_DIRS})
endmacro(rtmbuild_add_library)