Bug 1532878 - Install diffoscope from stretch-backports. r=dustin
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 07 Mar 2019 11:59:08 +0000
changeset 520924 4a6cb39329d1e0ef14194651a6a24408fb9ccec8
parent 520923 ed46ddfa23b76001614c4bd45c27ed113786b93b
child 520925 1a0f3a7891f481df308a373b86745e4da0277dd6
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1532878
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1532878 - Install diffoscope from stretch-backports. r=dustin As of the update snapshot, stretch-backports contains version 112. Depends on D22264 Differential Revision: https://phabricator.services.mozilla.com/D22265
taskcluster/docker/diffoscope/Dockerfile
--- a/taskcluster/docker/diffoscope/Dockerfile
+++ b/taskcluster/docker/diffoscope/Dockerfile
@@ -8,31 +8,23 @@ VOLUME /builds/worker/tooltool-cache
 
 ENV LANG=en_US.UTF-8
 
 RUN apt-get install \
       binutils-multiarch \
       bzip2 \
       curl \
       enjarify \
-      diffoscope \
+      diffoscope/stretch-backports \
       jsbeautifier \
       libc++abi1 \
       locales \
       openjdk-8-jdk-headless \
       python3-progressbar \
-      python3-setuptools \
-      python2.7 \
-      python-pip \
       unzip \
       zip \
-      git \
       && \
     sed -i '/en_US.UTF-8/s/^# *//' /etc/locale.gen && \
-    locale-gen && \
-    git clone https://salsa.debian.org/reproducible-builds/diffoscope.git /tmp/diffoscope && \
-    git -C /tmp/diffoscope checkout 202caf9d5d134e95f870d5f19f89511d635c27e4 && \
-    (cd /tmp/diffoscope && python3 setup.py install ) && \
-    rm -rf /tmp/diffoscope
+    locale-gen
 
 COPY get_and_diffoscope /builds/worker/bin/get_and_diffoscope
 
 RUN chown -R worker:worker /builds/worker/bin && chmod 755 /builds/worker/bin/*