From 2cdb2eb89722b636c4e39682bd50cbff4b6ebc62 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Wed, 25 Mar 2020 17:41:20 +0100 Subject: [PATCH 1/2] bot: Update grcov to version 0.5.10 --- bot/ci/bootstrap.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bot/ci/bootstrap.sh b/bot/ci/bootstrap.sh index d7345e951..2afd025ac 100755 --- a/bot/ci/bootstrap.sh +++ b/bot/ci/bootstrap.sh @@ -1,10 +1,11 @@ #!/bin/bash -ex -GRCOV_VERSION="v0.5.9" +GRCOV_VERSION="v0.5.10" MERCURIAL_VERSION="5.3" VERSION_CONTROL_TOOLS_REV="2f7b4df4a928" apt-get update -apt-get install --no-install-recommends -y gcc curl bzip2 python-dev +# libgoogle-perftools4 is currently required for grcov (until https://github.com/mozilla/grcov/issues/403 is fixed). +apt-get install --no-install-recommends -y gcc curl bzip2 python-dev libgoogle-perftools4 pip install --disable-pip-version-check --quiet --no-cache-dir mercurial==$MERCURIAL_VERSION From df032c4a96b7e3dafbf6621a2b82754616932520 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Wed, 25 Mar 2020 19:38:23 +0100 Subject: [PATCH 2/2] Remove grcov arguments that are no longer mandatory --- bot/code_coverage_bot/grcov.py | 13 +------------ bot/tests/test_grcov.py | 3 --- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/bot/code_coverage_bot/grcov.py b/bot/code_coverage_bot/grcov.py index b6f84faba..00e2d9abd 100644 --- a/bot/code_coverage_bot/grcov.py +++ b/bot/code_coverage_bot/grcov.py @@ -17,18 +17,7 @@ def report(artifacts, source_dir=None, out_format="covdir", options=[]): # Coveralls+ is only needed for zero-coverage reports if out_format == "coveralls+": - cmd.extend( - [ - "--service-name", - "TaskCluster", - "--commit-sha", - "unused", - "--token", - "unused", - "--service-job-number", - "1", - ] - ) + cmd.extend(["--token", "unused"]) if source_dir is not None: cmd.extend(["-s", source_dir]) diff --git a/bot/tests/test_grcov.py b/bot/tests/test_grcov.py index caa21112b..310acfa8b 100644 --- a/bot/tests/test_grcov.py +++ b/bot/tests/test_grcov.py @@ -24,10 +24,7 @@ def test_report_grcov_artifact_coverallsplus(grcov_artifact): output = grcov.report([grcov_artifact], out_format="coveralls+") report = json.loads(output.decode("utf-8")) assert report["repo_token"] == "unused" - assert report["service_name"] == "TaskCluster" - assert report["service_job_number"] == "1" assert report["git"]["branch"] == "master" - assert report["git"]["head"]["id"] == "unused" assert report["service_number"] == "" assert len(report["source_files"]) == 1 assert report["source_files"][0]["name"] == "js/src/jit/BitSet.cpp"