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

Install dependencies defined on packages.apt file in source code #317

Merged
merged 5 commits into from
Oct 9, 2020
+4 −108
Merged

Install dependencies defined on packages.apt file in source code #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01ae069
Install dependency from packages.apt file in source code
chapulina Oct 8, 2020
b991e46
sudo
chapulina Oct 8, 2020
316307d
Move to docker file
chapulina Oct 8, 2020
2d66fe4
Merge branch 'master' into chapulina/deps_from_packages.apt
chapulina Oct 8, 2020
415fa07
Revert "Revert "Dome CI: don't need to build deps from source (#305)"…
chapulina Oct 8, 2020
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
6 changes: 0 additions & 6 deletions jenkins-scripts/docker/ign_fuel-tools-compilation.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ if ! [[ ${IGN_FUEL_TOOLS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
exit -1
fi

if [[ ${IGN_FUEL_TOOLS_MAJOR_VERSION} -ge 5 ]]; then
export BUILD_IGN_MSGS=true
export IGN_MSGS_MAJOR_VERSION=6
export IGN_MSGS_BRANCH=master
fi

export GZDEV_PROJECT_NAME="ignition-fuel-tools${IGN_FUEL_TOOLS_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
26 changes: 0 additions & 26 deletions jenkins-scripts/docker/ign_gazebo-compilation.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,6 @@ if ! [[ ${IGN_GAZEBO_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
exit -1
fi

if [[ ${IGN_GAZEBO_MAJOR_VERSION} -ge 4 ]]; then
export BUILD_IGN_FUEL_TOOLS=true
export IGN_FUEL_TOOLS_MAJOR_VERSION=5
export IGN_FUEL_TOOLS_BRANCH=master

export BUILD_IGN_GUI=true
export IGN_GUI_MAJOR_VERSION=4
export IGN_GUI_BRANCH=master

export BUILD_IGN_PHYSICS=true
export IGN_PHYSICS_MAJOR_VERSION=3
export IGN_PHYSICS_BRANCH=master

export BUILD_IGN_RENDERING=true
export IGN_RENDERING_MAJOR_VERSION=4
export IGN_RENDERING_BRANCH=master

export BUILD_IGN_SENSORS=true
export IGN_SENSORS_MAJOR_VERSION=4
export IGN_SENSORS_BRANCH=master

export BUILD_IGN_TRANSPORT=true
export IGN_TRANSPORT_MAJOR_VERSION=9
export IGN_TRANSPORT_BRANCH=master
fi

export NEED_C17_COMPILER=true
export GPU_SUPPORT_NEEDED=true

Expand Down
14 changes: 0 additions & 14 deletions jenkins-scripts/docker/ign_gui-compilation.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,6 @@ if ! [[ ${IGN_GUI_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
exit -1
fi

if [[ ${IGN_GUI_MAJOR_VERSION} -ge 4 ]]; then
export BUILD_IGN_MSGS=true
export IGN_MSGS_MAJOR_VERSION=6
export IGN_MSGS_BRANCH=master

export BUILD_IGN_RENDERING=true
export IGN_RENDERING_MAJOR_VERSION=4
export IGN_RENDERING_BRANCH=master

export BUILD_IGN_TRANSPORT=true
export IGN_TRANSPORT_MAJOR_VERSION=9
export IGN_TRANSPORT_BRANCH=master
fi

if [[ ${IGN_GUI_MAJOR_VERSION} -ge 1 ]]; then
export NEED_C17_COMPILER=true
fi
Expand Down
30 changes: 0 additions & 30 deletions jenkins-scripts/docker/ign_launch-compilation.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,36 +28,6 @@ if ! [[ ${IGN_LAUNCH_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
exit -1
fi

if [[ ${IGN_LAUNCH_MAJOR_VERSION} -ge 3 ]]; then
export BUILD_IGN_FUEL_TOOLS=true
export IGN_FUEL_TOOLS_MAJOR_VERSION=5
export IGN_FUEL_TOOLS_BRANCH=master

export BUILD_IGN_GUI=true
export IGN_GUI_MAJOR_VERSION=4
export IGN_GUI_BRANCH=master

export BUILD_IGN_PHYSICS=true
export IGN_PHYSICS_MAJOR_VERSION=3
export IGN_PHYSICS_BRANCH=master

export BUILD_IGN_MSGS=true
export IGN_MSGS_MAJOR_VERSION=6
export IGN_MSGS_BRANCH=master

export BUILD_IGN_RENDERING=true
export IGN_RENDERING_MAJOR_VERSION=4
export IGN_RENDERING_BRANCH=master

export BUILD_IGN_SENSORS=true
export IGN_SENSORS_MAJOR_VERSION=4
export IGN_SENSORS_BRANCH=master

export BUILD_IGN_GAZEBO=true
export IGN_GAZEBO_MAJOR_VERSION=4
export IGN_GAZEBO_BRANCH=master
fi

export NEED_C17_COMPILER=true

export GZDEV_PROJECT_NAME="ignition-launch${IGN_LAUNCH_MAJOR_VERSION}"
Expand Down
6 changes: 0 additions & 6 deletions jenkins-scripts/docker/ign_rendering-compilation.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ if ! [[ ${IGN_RENDERING_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
exit -1
fi

if [[ ${IGN_RENDERING_MAJOR_VERSION} -ge 4 ]]; then
export BUILD_IGN_COMMON=true
export IGN_COMMON_MAJOR_VERSION=3
export IGN_COMMON_BRANCH=ign-common3
fi

if [[ ${IGN_RENDERING_MAJOR_VERSION} -ge 1 ]]; then
export NEED_C17_COMPILER=true
fi
Expand Down
18 changes: 0 additions & 18 deletions jenkins-scripts/docker/ign_sensors-compilation.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,6 @@ if ! [[ ${IGN_SENSORS_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
exit -1
fi

if [[ ${IGN_SENSORS_MAJOR_VERSION} -ge 4 ]]; then
export BUILD_IGN_GUI=true
export IGN_GUI_MAJOR_VERSION=4
export IGN_GUI_BRANCH=master

export BUILD_IGN_MSGS=true
export IGN_MSGS_MAJOR_VERSION=6
export IGN_MSGS_BRANCH=master

export BUILD_IGN_RENDERING=true
export IGN_RENDERING_MAJOR_VERSION=4
export IGN_RENDERING_BRANCH=master

export BUILD_IGN_TRANSPORT=true
export IGN_TRANSPORT_MAJOR_VERSION=9
export IGN_TRANSPORT_BRANCH=master
fi

export NEED_C17_COMPILER=true

export GPU_SUPPORT_NEEDED=true
Expand Down
7 changes: 0 additions & 7 deletions jenkins-scripts/docker/ign_transport-compilation.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ if [[ ${IGN_TRANSPORT_MAJOR_VERSION} -ge 6 ]]; then
export NEED_C17_COMPILER=true
fi

if [[ ${IGN_TRANSPORT_MAJOR_VERSION} -eq 9 ]]; then
export BUILD_IGN_MSGS=true
export IGN_MSGS_MAJOR_VERSION=6
export IGN_MSGS_BRANCH=master
fi


export GZDEV_PROJECT_NAME="ignition-transport${IGN_TRANSPORT_MAJOR_VERSION}"

. "${SCRIPT_DIR}/lib/generic-building-base.bash"
5 changes: 4 additions & 1 deletion jenkins-scripts/docker/lib/docker_generate_dockerfile.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,12 @@ RUN add-apt-repository ppa:j-rivero/simbody-artful
DELIM_DOCKER_WORKAROUND_SIMBODY
fi

# Install debian dependencies defined on the source code
SOURCE_DEFINED_DEPS="$(sort -u $(find . -iname 'packages-'$DISTRO'.apt' -o -iname 'packages.apt') | tr '\n' ' ')"

# Packages that will be installed and cached by docker. In a non-cache
# run below, the docker script will check for the latest updates
PACKAGES_CACHE_AND_CHECK_UPDATES="${BASE_DEPENDENCIES} ${DEPENDENCY_PKGS}"
PACKAGES_CACHE_AND_CHECK_UPDATES="${BASE_DEPENDENCIES} ${DEPENDENCY_PKGS} ${SOURCE_DEFINED_DEPS}"

if $USE_GPU_DOCKER; then
PACKAGES_CACHE_AND_CHECK_UPDATES="${PACKAGES_CACHE_AND_CHECK_UPDATES} ${GRAPHIC_CARD_PKG}"
Expand Down