From 571b10149da5a6ee0806109f076666b46d11604b Mon Sep 17 00:00:00 2001 From: iphydf Date: Sat, 17 Mar 2018 05:02:33 +0000 Subject: [PATCH] Fix coveralls reporting. The new clang version makes gcov segfault. Also, coveralls needs another package that it doesn't install the right version of by default. --- .travis.yml | 4 ++-- other/travis/toxcore-linux-install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3c46d98..5bb5a87d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: include: - stage: "Stage 1" env: JOB=toxcore ENV=linux - compiler: clang + compiler: gcc addons: apt: &apt-dependencies packages: @@ -26,7 +26,7 @@ matrix: - stage: "Stage 1" if: type IN (push, api, cron) env: JOB=autotools ENV=linux - compiler: gcc + compiler: clang addons: apt: *apt-dependencies - stage: "Stage 1" diff --git a/other/travis/toxcore-linux-install b/other/travis/toxcore-linux-install index 3bf452f1..19dccf64 100755 --- a/other/travis/toxcore-linux-install +++ b/other/travis/toxcore-linux-install @@ -1,7 +1,7 @@ #!/bin/sh # Install cpp-coveralls to upload test coverage results. -pip install --user urllib3[secure] cpp-coveralls +pip install --user ndg-httpsclient urllib3[secure] cpp-coveralls # Work around https://github.com/eddyxu/cpp-coveralls/issues/108 by manually # installing the pyOpenSSL module and injecting it into urllib3 as per