From 9c53b50ac171af9c5bd71a4edfa74fb497979615 Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Fri, 27 Nov 2020 02:12:46 +0900 Subject: [PATCH 1/4] remove released packages from .travis.rosinstall --- .travis.rosinstall.kinetic | 6 ------ .travis.rosinstall.melodic | 7 ------- 2 files changed, 13 deletions(-) diff --git a/.travis.rosinstall.kinetic b/.travis.rosinstall.kinetic index 33596fa568..3ea3a9a4ac 100644 --- a/.travis.rosinstall.kinetic +++ b/.travis.rosinstall.kinetic @@ -25,9 +25,3 @@ uri: https://github.com/tork-a/jsk_demos-release.git local-name: jsk_maps version: release/kinetic/jsk_maps -# Need to wait for app_manager 1.1.1 for kinetic and later. For indigo, we could not expect newer releases..... -# https://github.com/PR2/app_manager/issues/12 (Relerase request 1.1.1) -- git: - local-name: PR2/app_manager - uri: https://github.com/PR2/app_manager.git - version: kinetic-devel diff --git a/.travis.rosinstall.melodic b/.travis.rosinstall.melodic index d78566b500..5dd77f46a2 100644 --- a/.travis.rosinstall.melodic +++ b/.travis.rosinstall.melodic @@ -23,19 +23,12 @@ uri: https://github.com/tork-a/jsk_demos-release.git local-name: jsk_maps version: release/kinetic/jsk_maps -- git: # wait until releasing (https://github.com/PR2/app_manager/issues/12) - uri: https://github.com/pr2/app_manager.git - local-name: app_manager - git: # wait for melodic release https://github.com/ros-naoqi/pepper_robot/issues/50 uri: https://github.com/ros-naoqi/pepper_robot.git local-name: pepper_robot - git: # https://github.com/ros-naoqi/nao_robot/issues/40 uri: https://github.com/ros-naoqi/nao_robot.git local-name: nao_robot -- git: # use latest pr2_computer_monitor, wait for melodic release https://github.com/PR2/pr2_robot/issues/261 - uri: https://github.com/pr2-gbp/pr2_robot-release.git - local-name: pr2_computer_monitor - version: release/kinetic/pr2_computer_monitor - git: # use naoqi_pose, wait for melodic release https://github.com/ros-naoqi/naoqi_bridge/issues/94 uri: https://github.com/ros-naoqi/naoqi_bridge-release.git local-name: naoqi_pose From 639296c0833f8c2c114448c08b8dfb78d7e28967 Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Fri, 27 Nov 2020 02:13:35 +0900 Subject: [PATCH 2/4] update jsk_travis to 0.5.17 --- .travis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis b/.travis index 6edf53caf5..cbcbaab8a9 160000 --- a/.travis +++ b/.travis @@ -1 +1 @@ -Subproject commit 6edf53caf5b8e2b4a392673b7e652916408ec9c7 +Subproject commit cbcbaab8a9ce7d1b369cdb3e08aa46fede046ec0 From 8856e358e6425fdfa1b8e93d0ab75e70cf03b7fe Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Fri, 27 Nov 2020 15:25:22 +0900 Subject: [PATCH 3/4] update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5dede479b4..4ad240ab69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,4 +48,4 @@ before_script: - if [ "$ROS_DISTRO" == "melodic" ]; then export BEFORE_SCRIPT="pwd; ls -al ; ls -al jsk_robot/; ls -al jsk_robot/.travis.rosinstall.melodic; wstool merge jsk_robot/.travis.rosinstall.melodic; wstool update"; fi # skip running postinst for ros-ROS_DISTRO-julius https://gist.github.com/jordansissel/748313#file-stripdeb-sh - export BEFORE_SCRIPT="apt-get download ros-$ROS_DISTRO-julius; wget -O stripdeb.sh https://gist.githubusercontent.com/jordansissel/748313/raw/8aebce360bc082e33af7bba3c90f755eb655783b/stripdeb.sh; bash stripdeb.sh ros-$ROS_DISTRO-julius*.deb; sudo dpkg --force-all -i ros-$ROS_DISTRO-julius*.deb; sudo apt-get -y -f install; sudo apt-mark hold ros-$ROS_DISTRO-julius; $BEFORE_SCRIPT" -script: source .travis/travis.sh +script: .travis/travis.sh From 980643cd9586fe42e6e8ac224e45005bddb855af Mon Sep 17 00:00:00 2001 From: Shingo Kitagawa Date: Fri, 27 Nov 2020 22:34:30 +0900 Subject: [PATCH 4/4] install fetch_ros from source we need following PRs which are not released yet. https://github.com/fetchrobotics/fetch_ros/pull/144 https://github.com/fetchrobotics/fetch_ros/pull/146 --- .travis.rosinstall.indigo | 7 +++++++ .travis.rosinstall.kinetic | 7 +++++++ .travis.rosinstall.melodic | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/.travis.rosinstall.indigo b/.travis.rosinstall.indigo index 4ba997341d..6e0b988d71 100644 --- a/.travis.rosinstall.indigo +++ b/.travis.rosinstall.indigo @@ -18,3 +18,10 @@ local-name: strands-project/mongodb_store uri: https://github.com/strands-project/mongodb_store.git version: 0.4.5 +# jsk_fetch_startup requires fetch_ros with following PRs. +# https://github.com/fetchrobotics/fetch_ros/pull/144 +# https://github.com/fetchrobotics/fetch_ros/pull/146 +- git: + local-name: fetchrobotics/fetch_ros + uri: https://github.com/fetchrobotics/fetch_ros.git + version: 0ad250a996a2ef68172fc064698f253bc9cf08d0 diff --git a/.travis.rosinstall.kinetic b/.travis.rosinstall.kinetic index 3ea3a9a4ac..8e86456b2e 100644 --- a/.travis.rosinstall.kinetic +++ b/.travis.rosinstall.kinetic @@ -25,3 +25,10 @@ uri: https://github.com/tork-a/jsk_demos-release.git local-name: jsk_maps version: release/kinetic/jsk_maps +# jsk_fetch_startup requires fetch_ros with following PRs. +# https://github.com/fetchrobotics/fetch_ros/pull/144 +# https://github.com/fetchrobotics/fetch_ros/pull/146 +- git: + local-name: fetchrobotics/fetch_ros + uri: https://github.com/fetchrobotics/fetch_ros.git + version: 0ad250a996a2ef68172fc064698f253bc9cf08d0 diff --git a/.travis.rosinstall.melodic b/.travis.rosinstall.melodic index 5dd77f46a2..2cdfd52a68 100644 --- a/.travis.rosinstall.melodic +++ b/.travis.rosinstall.melodic @@ -33,3 +33,10 @@ uri: https://github.com/ros-naoqi/naoqi_bridge-release.git local-name: naoqi_pose version: release/kinetic/naoqi_pose +# jsk_fetch_startup requires fetch_ros with following PRs. +# https://github.com/fetchrobotics/fetch_ros/pull/144 +# https://github.com/fetchrobotics/fetch_ros/pull/146 +- git: + local-name: fetchrobotics/fetch_ros + uri: https://github.com/fetchrobotics/fetch_ros.git + version: ba4bafdb802e474487d1e0d893aa25c9535dc55f