Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

always install build-essential #525

Merged
merged 1 commit into from
Jun 7, 2020
Merged

always install build-essential #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions industrial_ci/src/docker.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
_FOLDING_TYPE
_DEFAULT_DEBS
ABICHECK_URL
ABICHECK_VERSION
ADDITIONAL_DEBS
Expand Down
3 changes: 1 addition & 2 deletions industrial_ci/src/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ function set_ros_variables {
"noetic")
BUILDER=${BUILDER:-colcon}
ros1_defaults "focal"
DEFAULT_DOCKER_IMAGE=
ROS_PYTHON_VERSION=3
;;
"ardent")
Expand Down Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions industrial_ci/src/workspace.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down