always install build-essential (#525)

ros-industrial · Jun 7, 2020 · d30f4d3 · d30f4d3
1 parent ef83251
commit d30f4d3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/industrial_ci/src/docker.env b/industrial_ci/src/docker.env
@@ -1,4 +1,5 @@
 _FOLDING_TYPE
+_DEFAULT_DEBS
 ABICHECK_URL
 ABICHECK_VERSION
 ADDITIONAL_DEBS

diff --git a/industrial_ci/src/env.sh b/industrial_ci/src/env.sh
@@ -112,7 +112,6 @@ function set_ros_variables {
     "noetic")
         BUILDER=${BUILDER:-colcon}
         ros1_defaults "focal"
-        DEFAULT_DOCKER_IMAGE=
         ROS_PYTHON_VERSION=3
         ;;
     "ardent")
@@ -219,7 +218,7 @@ if [ -z "$OS_CODE_NAME" ]; then
             ici_error "ROS distro '$ROS_DISTRO' is not supported"
         fi
         OS_CODE_NAME=$DEFAULT_OS_CODE_NAME
-        #DEFAULT_DOCKER_IMAGE=${DEFAULT_DOCKER_IMAGE-ros:${ROS_DISTRO}-ros-core}
+        DEFAULT_DOCKER_IMAGE=${DEFAULT_DOCKER_IMAGE-ros:${ROS_DISTRO}-ros-core}
         ;;
     esac
 else

diff --git a/industrial_ci/src/workspace.sh b/industrial_ci/src/workspace.sh
@@ -56,6 +56,15 @@ function ici_apt_install {
 
 function ici_init_apt {
     ici_asroot apt-get update -qq
+
+    local debs_default=(build-essential)
+    if [ -n "$_DEFAULT_DEBS" ]; then
+        ici_parse_env_array debs_default _DEFAULT_DEBS
+    fi
+    if [ -n "${debs_default[*]}" ]; then
+        ici_apt_install "${debs_default[@]}"
+    fi
+
     # If more DEBs needed during preparation, define ADDITIONAL_DEBS variable where you list the name of DEB(S, delimitted by whitespace)
     local -a debs
     ici_parse_env_array debs ADDITIONAL_DEBS