diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-03-17 05:02:33 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-03-17 05:02:33 +0000 |
commit | 571b10149da5a6ee0806109f076666b46d11604b (patch) | |
tree | 6453df6e98565bcf8fbe8cc745d0703282063f00 | |
parent | 2f39bd33c32ffcb6624bb3ccd0cff5af4bc2bf8a (diff) |
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.
-rw-r--r-- | .travis.yml | 4 | ||||
-rwxr-xr-x | 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: | |||
10 | include: | 10 | include: |
11 | - stage: "Stage 1" | 11 | - stage: "Stage 1" |
12 | env: JOB=toxcore ENV=linux | 12 | env: JOB=toxcore ENV=linux |
13 | compiler: clang | 13 | compiler: gcc |
14 | addons: | 14 | addons: |
15 | apt: &apt-dependencies | 15 | apt: &apt-dependencies |
16 | packages: | 16 | packages: |
@@ -26,7 +26,7 @@ matrix: | |||
26 | - stage: "Stage 1" | 26 | - stage: "Stage 1" |
27 | if: type IN (push, api, cron) | 27 | if: type IN (push, api, cron) |
28 | env: JOB=autotools ENV=linux | 28 | env: JOB=autotools ENV=linux |
29 | compiler: gcc | 29 | compiler: clang |
30 | addons: | 30 | addons: |
31 | apt: *apt-dependencies | 31 | apt: *apt-dependencies |
32 | - stage: "Stage 1" | 32 | - 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | # Install cpp-coveralls to upload test coverage results. | 3 | # Install cpp-coveralls to upload test coverage results. |
4 | pip install --user urllib3[secure] cpp-coveralls | 4 | pip install --user ndg-httpsclient urllib3[secure] cpp-coveralls |
5 | 5 | ||
6 | # Work around https://github.com/eddyxu/cpp-coveralls/issues/108 by manually | 6 | # Work around https://github.com/eddyxu/cpp-coveralls/issues/108 by manually |
7 | # installing the pyOpenSSL module and injecting it into urllib3 as per | 7 | # installing the pyOpenSSL module and injecting it into urllib3 as per |