update travis.yml

ipa320 · Jan 6, 2020 · c57db0e · c57db0e
1 parent d6fe292
commit c57db0e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.travis.rosinstall b/.travis.rosinstall
@@ -23,6 +23,10 @@
     uri: https://github.com/ipa320/cob_supported_robots.git
     version: indigo_dev
 
+- git:
+    local-name: realsense_substitute
+    uri: https://github.com/ipa320/realsense.git
+    version: realsense_substitute
 - git:
     local-name: realsense2_substitute
     uri: https://github.com/ipa320/realsense.git

diff --git a/.travis.rosinstall.melodic b/.travis.rosinstall.melodic
@@ -47,7 +47,6 @@
     uri: https://github.com/ipa320/cob_supported_robots.git
     version: indigo_dev
 
-
 - git:
     local-name: realsense_substitute
     uri: https://github.com/ipa320/realsense.git

diff --git a/.travis.yml b/.travis.yml
@@ -9,17 +9,20 @@ notifications:
 env:
   global:
     - ROS_REPO=ros
-    - NOT_TEST_INSTALL=true
+    - VERBOSE_OUTPUT=false
+    - VERBOSE_TESTS=false
+    - NOT_TEST_DOWNSTREAM=true
+    - CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release
+    - ADDITIONAL_DEBS='wget'
   matrix:
-    - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=file BEFORE_SCRIPT='wget -O - https://raw.githubusercontent.com/mojin-robotics/realsense/realsense_substitute/realsense_camera/patch/patch_docker.sh | bash'
-    - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debian BEFORE_SCRIPT='wget -O - https://raw.githubusercontent.com/mojin-robotics/realsense/realsense_substitute/realsense_camera/patch/patch_docker.sh | bash'
+    - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=file AFTER_SETUP_TARGET_WORKSPACE='wget -O - https://raw.githubusercontent.com/mojin-robotics/realsense/realsense_substitute/realsense_camera/patch/patch_docker.sh | bash'
+    - ROS_DISTRO=kinetic UPSTREAM_WORKSPACE=debian AFTER_SETUP_TARGET_WORKSPACE='wget -O - https://raw.githubusercontent.com/mojin-robotics/realsense/realsense_substitute/realsense_camera/patch/patch_docker.sh | bash'
     - ROS_DISTRO=melodic UPSTREAM_WORKSPACE=file
     - ROS_DISTRO=melodic UPSTREAM_WORKSPACE=debian
 matrix:
   allow_failures:
     - env: ROS_DISTRO=melodic UPSTREAM_WORKSPACE=debian
 install:
-  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
+  - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .industrial_ci -b master
 script:
-  - .ci_config/travis.sh
-#  - ./travis.sh  # Enable this when you have a package-local script
+  - .industrial_ci/travis.sh