зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1694784 - Move valgrind install to the valgrind docker image. r=firefox-build-system-reviewers,andi,sheehan,mhentges
We don't need the valgrind package for the valgrind.h header anymore, because it's in the sysroot, and we only needed the package in the build docker image because of the header. We still do need it in the valgrind build image, because we run valgrind in the builds using that image. The valgrind build image Dockerfile doesn't need an update because valgrind will be pulled through the install of valgrind-dbg that already happens there. Differential Revision: https://phabricator.services.mozilla.com/D106355
This commit is contained in:
Родитель
2ddf2a1c45
Коммит
0c34aeda82
|
@ -72,8 +72,6 @@ jobs:
|
|||
symbol: I(deb8)
|
||||
parent: debian8-base
|
||||
definition: debian-build
|
||||
packages:
|
||||
- deb8-valgrind
|
||||
args:
|
||||
ARCH: amd64
|
||||
debian8-mozjs-rust-build:
|
||||
|
@ -84,6 +82,8 @@ jobs:
|
|||
valgrind-build:
|
||||
symbol: I(vb)
|
||||
parent: debian8-amd64-build
|
||||
packages:
|
||||
- deb8-valgrind
|
||||
lint:
|
||||
symbol: I(lnt)
|
||||
# Neither the debian10-raw nor the debian10-packages images can have
|
||||
|
|
|
@ -67,7 +67,6 @@ RUN apt-get update && \
|
|||
tar \
|
||||
unzip \
|
||||
uuid \
|
||||
valgrind \
|
||||
wget \
|
||||
x11-utils \
|
||||
xvfb \
|
||||
|
|
|
@ -5,12 +5,16 @@ VOLUME /builds/worker/checkouts
|
|||
VOLUME /builds/worker/workspace
|
||||
VOLUME /builds/worker/tooltool-cache
|
||||
|
||||
ARG TASKCLUSTER_ROOT_URL
|
||||
ARG DOCKER_IMAGE_PACKAGES
|
||||
RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAGES
|
||||
|
||||
# We could try to be smart and install all the -dbg packages corresponding to
|
||||
# the installed packages, but, not all of them are actually for libraries used
|
||||
# by Firefox, leading to a larger docker image. Moreover, some of the -dbg
|
||||
# packages for unnecessary libraries pull other packages through dependencies,
|
||||
# that make for even larger docker images.
|
||||
RUN apt-get install \
|
||||
RUN apt-get update && apt-get install \
|
||||
dbus-1-dbg \
|
||||
libatk-bridge2.0-0-dbg \
|
||||
libatk1.0-dbg \
|
||||
|
|
Загрузка…
Ссылка в новой задаче