CI: Fix codecov upload

This commit is contained in:
Wilson Snyder 2024-07-28 13:58:26 -04:00
parent 1609c23fea
commit 7f40dd8b5b
3 changed files with 13 additions and 8 deletions

View File

@ -100,4 +100,6 @@ jobs:
- name: Upload coverage data to Codecov
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
run: ( cd nodist/obj_dir/upload && ../../../ci/codecov -v do-upload -Z --sha ${{ github.sha }} -f ../../../nodist/obj_dir/coverage/app_total.info )
run: |
find . -name '*.gcno' -exec rm {} \;
./ci/codecov -v do-upload -Z --sha ${{ github.sha }} -f nodist/obj_dir/coverage/app_total.info

View File

@ -181,14 +181,17 @@ def test():
ci_fold_start("upload")
print("Stage 18: Upload")
# curl -Os https://cli.codecov.io/latest/linux/codecov ; sudo chmod +x codecov
# --disable-search does not seem to work, so we use a temp directory
# --disable-search does not seem to work
# -d with false directory does not seem to work
# So, remove gcno files before calling codecov
upload_dir = "nodist/obj_dir/upload"
os.makedirs(upload_dir, exist_ok=True)
cmd = ("( cd " + upload_dir +
" && ../../../ci/codecov -v do-upload --fail-on-error" +
" -f ../../../" + cc_dir + "/app_total.info )")
print("print: Not running: export CODECOV_TOKEN=<hidden>")
print("print: Not running: " + cmd)
cmd = ("ci/codecov -v upload-process -Z" +
" -f " + cc_dir + "/app_total.info )")
print("print: Not running:")
print(" export CODECOV_TOKEN=<hidden>")
print(" find . -name '*.gcno' -exec rm {} \;")
print(" " + cmd)
ci_fold_end()
if Args.stage_enabled[19]:

View File

@ -675,7 +675,7 @@ def distillLine(line_raw, lines, branches, include_exceptional_branches):
count = int(line_raw["count"])
if count < 0:
if "function_name" in line_raw:
logging.warning("Ignoring negative count found in %s.", line_raw["function_name"])
logging.warning("Ignoring negative count found in '%s'.", line_raw["function_name"])
else:
logging.warning("Ignoring negative count.")
count = 0