From 7fe3f2b07f139b5d7a9638e65e4d5db681caba98 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 7 Jan 2020 16:32:21 +0100 Subject: [PATCH 1/3] Use Mercurial with Python 3 Fixes #332 --- bot/ci/bootstrap.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/bot/ci/bootstrap.sh b/bot/ci/bootstrap.sh index c3d28e163..3ef6cf420 100755 --- a/bot/ci/bootstrap.sh +++ b/bot/ci/bootstrap.sh @@ -4,12 +4,9 @@ MERCURIAL_VERSION="5.2" VERSION_CONTROL_TOOLS_REV="102106f53cb2" apt-get update -apt-get install --no-install-recommends -y gcc curl bzip2 python2-minimal python-bz2file python-dev +apt-get install --no-install-recommends -y gcc curl -# Setup mercurial from its own website, without install pip2 which has a lot of dependencies -curl -L https://www.mercurial-scm.org/release/mercurial-$MERCURIAL_VERSION.tar.gz | tar -C /opt -xvz -cd /opt/mercurial-$MERCURIAL_VERSION -python2 setup.py install +pip install --disable-pip-version-check --quiet --no-cache-dir mercurial==$MERCURIAL_VERSION # Setup grcov curl -L https://github.com/mozilla/grcov/releases/download/$GRCOV_VERSION/grcov-linux-x86_64.tar.bz2 | tar -C /usr/bin -xjv From 2fda2fea9b239f32820bf5f3f205ca2248484ca7 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 7 Jan 2020 16:43:45 +0100 Subject: [PATCH 2/3] Install python-dev --- bot/ci/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/ci/bootstrap.sh b/bot/ci/bootstrap.sh index 3ef6cf420..c7f9df1f6 100755 --- a/bot/ci/bootstrap.sh +++ b/bot/ci/bootstrap.sh @@ -4,7 +4,7 @@ MERCURIAL_VERSION="5.2" VERSION_CONTROL_TOOLS_REV="102106f53cb2" apt-get update -apt-get install --no-install-recommends -y gcc curl +apt-get install --no-install-recommends -y gcc curl python-dev pip install --disable-pip-version-check --quiet --no-cache-dir mercurial==$MERCURIAL_VERSION From fbef2590182c0b6f20a2235351f5977fc0ed3524 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 7 Jan 2020 17:16:33 +0100 Subject: [PATCH 3/3] Install bzip2 as it's needed to extract grcov, but uninstall it at the end of the script --- bot/ci/bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/ci/bootstrap.sh b/bot/ci/bootstrap.sh index c7f9df1f6..915d61cb1 100755 --- a/bot/ci/bootstrap.sh +++ b/bot/ci/bootstrap.sh @@ -4,7 +4,7 @@ MERCURIAL_VERSION="5.2" VERSION_CONTROL_TOOLS_REV="102106f53cb2" apt-get update -apt-get install --no-install-recommends -y gcc curl python-dev +apt-get install --no-install-recommends -y gcc curl bzip2 python-dev pip install --disable-pip-version-check --quiet --no-cache-dir mercurial==$MERCURIAL_VERSION @@ -17,7 +17,7 @@ hg clone -r $VERSION_CONTROL_TOOLS_REV https://hg.mozilla.org/hgcustom/version-c ln -s /src/bot/ci/hgrc $HOME/.hgrc # Cleanup -apt-get purge -y gcc curl python-dev +apt-get purge -y gcc curl bzip2 python-dev apt-get autoremove -y rm -rf /var/lib/apt/lists/* rm -rf /src/version-control-tools/.hg /src/version-control-tools/ansible /src/version-control-tools/docs /src/version-control-tools/testing