Test install tags even in devel jobs

ros-industrial · Jul 21, 2021 · 84add89 · 84add89
1 parent 2765b4a
commit 84add89
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/industrial_ci/src/builders/catkin_make_devel.sh b/industrial_ci/src/builders/catkin_make_devel.sh
@@ -23,11 +23,3 @@ ici_warn "BUILDER=catkin_make_devel should only be used in addition to the other
 function ici_extend_space {
     echo "$1/devel"
 }
-
-function builder_run_build {
-    local extend=$1; shift
-    local ws=$1; shift
-    local opts=()
-    _append_job_opts opts PARALLEL_BUILDS 0
-    _run_catkin_make all "$extend" "$ws" "${opts[@]}" "$@"
-}
diff --git a/industrial_ci/src/builders/catkin_make_isolated_devel.sh b/industrial_ci/src/builders/catkin_make_isolated_devel.sh
@@ -23,11 +23,3 @@ ici_warn "BUILDER=catkin_make_isolated_devel should only be used in addition to
 function ici_extend_space {
     echo "$1/devel"
 }
-
-function builder_run_build {
-    local extend=$1; shift
-    local ws=$1; shift
-    local opts=()
-    _append_job_opts opts PARALLEL_BUILDS 0
-    _run_catkin_make_isolated all "$extend" "$ws" "${opts[@]}" "$@"
-}
diff --git a/industrial_ci/src/builders/catkin_tools_devel.sh b/industrial_ci/src/builders/catkin_tools_devel.sh
@@ -27,5 +27,5 @@ function ici_extend_space {
 function _catkin_config {
     local extend=$1; shift
     local ws=$1; shift
-    ici_exec_in_workspace "$extend" "$ws" catkin config --init
+    ici_exec_in_workspace "$extend" "$ws" catkin config --link-devel --install
 }