diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2020-04-05 22:28:10 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2020-04-05 22:28:10 +0000 |
| commit | 02abc8932d40991b186fb649ecf5454decb5c065 (patch) | |
| tree | 30bbfc00b1911ee3106775bb905aad7a83141ffa /ci | |
| parent | c92c6f3f1d290c7018e353ff544a26c93cdc3948 (diff) | |
| download | strace-02abc8932d40991b186fb649ecf5454decb5c065.tar.gz | |
ci: workaround unusable codecov-python
As codecov-python, starting with commit
v2.0.15-44-g9f50cca7e5c5e0bb5e2859db238da08e3195e105 released almost
a month ago, became an utterly unusable pile of garbage, switch to
codecov-bash that still works.
* ci/install-dependencies.sh [$CHECK == coverage]: Do not install
lcov, python-pip, python-setuptools, and codecov. Download
https://codecov.io/bash and save it as codecov.bash.
* ci/run-build-and-tests.sh [$CHECK == coverage] (ac_cv_prog_LCOV,
ac_cv_prog_GENHTML): New variables, export them.
[[$CHECK == coverage]: Invoke codecov.bash instead of codecov.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/install-dependencies.sh | 5 | ||||
| -rwxr-xr-x | ci/run-build-and-tests.sh | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index a0099faa3..6b6dc02ee 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -143,9 +143,8 @@ esac case "${CHECK-}" in coverage) - apt_get_install lcov python-pip python-setuptools - retry_if_failed \ - pip install --user codecov + curl -s -S https://codecov.io/bash > codecov.bash + chmod u+x codecov.bash ;; valgrind) apt_get_install valgrind diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index f031ce6d1..2186ebcc0 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -46,6 +46,9 @@ esac case "${CHECK-}" in coverage) DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --enable-code-coverage" + ac_cv_prog_LCOV=lcov + ac_cv_prog_GENHTML=genhtml + export ac_cv_prog_LCOV ac_cv_prog_GENHTML ;; valgrind) DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --enable-valgrind" @@ -88,10 +91,10 @@ case "${CHECK-}" in coverage) make -k $j all VERBOSE=${VERBOSE-} CFLAGS='-g -Og' make -k $j2 check VERBOSE=${VERBOSE-} - codecov --gcov-args=-abcp ||: echo 'BEGIN OF TEST SUITE INFORMATION' tail -n 99999 -- tests*/test-suite.log tests*/ksysent.gen.log echo 'END OF TEST SUITE INFORMATION' + ./codecov.bash -Z -a -abc ;; valgrind) make -k $j all VERBOSE=${VERBOSE-} |