diff options
| -rw-r--r-- | .circleci/config.yml | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 390934e1a..809e752b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,6 @@ references: name: Capturing Lua coverage data command: | set -e - sudo luarocks install luacov-coveralls if [ ! -z $COVERALLS_REPO_TOKEN ]; then luacov-coveralls -t ${COVERALLS_REPO_TOKEN} || true; fi - &restore_coverage_data @@ -35,9 +34,14 @@ references: set -e if [ -f ~/project/coverage.rspamd-test.info ] && [ -f ~/project/coverage.functional.info ]; then sudo apt-get install -qq lcov - lcov -a ~/project/coverage.rspamd-test.info -t rspamd-test -a ~/project/coverage.functional.info -t functional -o coverage.info + # lcov -a ~/project/coverage.rspamd-test.info -t rspamd-test -a ~/project/coverage.functional.info -t functional -o coverage.info gem install coveralls-lcov - if [ ! -z $COVERALLS_REPO_TOKEN ]; then coveralls-lcov -t ${COVERALLS_REPO_TOKEN} coverage.info || true; fi + sudo pip install cpp-coveralls + sudo luarocks install luacov-coveralls + if [ ! -z $COVERALLS_REPO_TOKEN ]; then + coveralls coverage.info --dump coveralls.dump || true; + luacov-coveralls -t ${COVERALLS_REPO_TOKEN} -j coveralls.dump --root=../project + fi fi version: 2 @@ -77,14 +81,14 @@ jobs: - run: make rspamd-test -j`nproc` - run: set +e; test/rspamd-test -p /rspamd/lua; echo "export RETURN_CODE=$?" >> $BASH_ENV - - *capture_coverage_data - - *capture_lua_coverage_data + #- *capture_coverage_data + #- *capture_lua_coverage_data # Share coverage data between jobs - - save_cache: - key: coverage-{{ .Environment.CIRCLE_WORKFLOW_ID }} - paths: - - coverage.rspamd-test.info + #- save_cache: + # key: coverage-{{ .Environment.CIRCLE_WORKFLOW_ID }} + # paths: + # - coverage.rspamd-test.info - run: (exit $RETURN_CODE) @@ -108,13 +112,13 @@ jobs: - run: cd ../build - run: set +e; RSPAMD_INSTALLROOT=../install sudo -E robot -x xunit.xml --exclude isbroken ../project/test/functional/cases; echo "export RETURN_CODE=$?" >> $BASH_ENV - - *capture_coverage_data + #- *capture_coverage_data # Share coverage data between jobs - - save_cache: - key: coverage-{{ .Environment.CIRCLE_WORKFLOW_ID }} - paths: - - coverage.functional.info + #- save_cache: + # key: coverage-{{ .Environment.CIRCLE_WORKFLOW_ID }} + # paths: + # - coverage.functional.info - store_artifacts: path: output.xml |