comparison contrib/automation/hgautomation/linux.py @ 43014:136c2536d83f

automation: always install docker-ce Docker has published packages for Ubuntu Disco and we no longer need this one-off. Differential Revision: https://phab.mercurial-scm.org/D6911
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 29 Sep 2019 10:19:02 -0700
parents 198b51d453fe
children 3aa227feffbe
comparison
equal deleted inserted replaced
43013:198b51d453fe 43014:136c2536d83f
217 clang-format-6.0 \ 217 clang-format-6.0 \
218 cvs \ 218 cvs \
219 darcs \ 219 darcs \
220 debhelper \ 220 debhelper \
221 devscripts \ 221 devscripts \
222 docker-ce \
222 dpkg-dev \ 223 dpkg-dev \
223 dstat \ 224 dstat \
224 emacs \ 225 emacs \
225 gettext \ 226 gettext \
226 git \ 227 git \
280 # Ubuntu 19.04 removes monotone. 281 # Ubuntu 19.04 removes monotone.
281 if [ "$LSB_RELEASE" != "disco" ]; then 282 if [ "$LSB_RELEASE" != "disco" ]; then
282 PACKAGES="$PACKAGES monotone" 283 PACKAGES="$PACKAGES monotone"
283 fi 284 fi
284 285
285 # As of April 27, 2019, Docker hasn't published packages for
286 # Ubuntu 19.04 yet.
287 if [ "$LSB_RELEASE" != "disco" ]; then
288 PACKAGES="$PACKAGES docker-ce"
289 fi
290
291 sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install --no-install-recommends $PACKAGES 286 sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install --no-install-recommends $PACKAGES
292 287
293 # Create clang-format symlink so test harness finds it. 288 # Create clang-format symlink so test harness finds it.
294 sudo update-alternatives --install /usr/bin/clang-format clang-format \ 289 sudo update-alternatives --install /usr/bin/clang-format clang-format \
295 /usr/bin/clang-format-6.0 1000 290 /usr/bin/clang-format-6.0 1000