diff --git a/ci/upload-coverage.sh b/ci/upload-coverage.sh index 250d8c90ef..ef0bdb6e42 100755 --- a/ci/upload-coverage.sh +++ b/ci/upload-coverage.sh @@ -11,11 +11,6 @@ if [ "${CIRRUS_REPO_FULL_NAME}" != "zeek/zeek" ]; then exit 0 fi -if [ "${CIRRUS_BRANCH}" != "master" ]; then - echo "Coverage upload skipped for non-master branches" - exit 0 -fi - cd testing/coverage make coverage make coveralls diff --git a/testing/coverage/lcov_html.sh b/testing/coverage/lcov_html.sh index 2d166282fe..18898048b4 100755 --- a/testing/coverage/lcov_html.sh +++ b/testing/coverage/lcov_html.sh @@ -131,6 +131,11 @@ if [ $HTML_REPORT -eq 1 ]; then echo -n "Creating HTML files... " verify_run "genhtml --ignore-errors empty -o $COVERAGE_HTML_DIR $COVERAGE_FILE" else + if [ "${CIRRUS_BRANCH}" != "master" ]; then + echo "Coverage upload skipped for non-master branches" + exit 0 + fi + # The data we send to coveralls has a lot of duplicate files in it because of the # zeek symlink in the src directory. Run a script that cleans that up. echo -n "Cleaning coverage data for Coveralls..."