Merge branch 'master' into fix-20

Author: La0

addon/package-lock.json

@@ -12,7 +12,7 @@
     "eslint-plugin-mozilla": "^0.9.0",
     "eslint-plugin-no-unsanitized": "^3.0.2",
     "web-ext": "^3.1.1",
-    "webpack": "^4.39.1",
+    "webpack": "^4.39.2",
     "webpack-cli": "^3.3.6"
   },
   "scripts": {

addon/package.json

@@ -1,9 +1,14 @@
 #!/bin/bash -ex
 GRCOV_VERSION="v0.5.3"
-MERCURIAL_VERSION="4.8"
+MERCURIAL_VERSION="5.1"
 
 apt-get update
-apt-get install --no-install-recommends -y mercurial=4.8.* curl lcov bzip2
+apt-get install --no-install-recommends -y curl lcov bzip2 python2-minimal python-bz2file python-dev
+
+# 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
 
 # Setup grcov
 curl -L https://github.com/mozilla/grcov/releases/download/$GRCOV_VERSION/grcov-linux-x86_64.tar.bz2 | tar -C /usr/bin -xjv

bot/ci/bootstrap.sh

@@ -13,7 +13,7 @@ def test_mercurial():
 
     # Check mercurial version
     output = run_check(["hg", "version", "-T", "{ver}"])
-    assert output.decode("utf-8").startswith("4.8")
+    assert output.decode("utf-8").startswith("5.1")
 
     # Check needed extensions
     output = run_check(["hg", "version", "-T", "{extensions}"])