D6911: automation: always install docker-ce
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Sun Sep 29 19:08:23 UTC 2019
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Docker has published packages for Ubuntu Disco and we no longer
need this one-off.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6911
AFFECTED FILES
contrib/automation/hgautomation/linux.py
CHANGE DETAILS
diff --git a/contrib/automation/hgautomation/linux.py b/contrib/automation/hgautomation/linux.py
--- a/contrib/automation/hgautomation/linux.py
+++ b/contrib/automation/hgautomation/linux.py
@@ -219,6 +219,7 @@
darcs \
debhelper \
devscripts \
+ docker-ce \
dpkg-dev \
dstat \
emacs \
@@ -282,12 +283,6 @@
PACKAGES="$PACKAGES monotone"
fi
-# As of April 27, 2019, Docker hasn't published packages for
-# Ubuntu 19.04 yet.
-if [ "$LSB_RELEASE" != "disco" ]; then
- PACKAGES="$PACKAGES docker-ce"
-fi
-
sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install --no-install-recommends $PACKAGES
# Create clang-format symlink so test harness finds it.
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list