common: update CODECOV workflow file

pmem · May 9, 2024 · 3d719ba · 3d719ba
1 parent 3a208d6
commit 3d719ba
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 60 deletions.
diff --git a/.github/workflows/scan_coverage.yml b/.github/workflows/scan_coverage.yml
@@ -3,6 +3,9 @@ name: Coverage
 
 on:
   workflow_call:
+    secrets:
+      CODECOV_TOKEN:
+        required: true
 
 env:
   # Note: All coverage scans, e.g. on pull requests, should be run in the same
@@ -20,6 +23,7 @@ env:
   COVERAGE:     1
   TEST_BUILD:   debug
   FAULT_INJECTION: 1
+  CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
 jobs:
   linux:
@@ -32,5 +36,12 @@ jobs:
       - name: Pull the image
         run: cd $WORKDIR && ./pull-or-rebuild-image.sh
 
-      - name: Measure and upload code coverage
+      - name: Run the build
         run: cd $WORKDIR && ./build-CI.sh
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          root_dir: /home/runner/work/pmdk/pmdk/
+          directory: /home/runner/work/pmdk/pmdk/
+          verbose: true
diff --git a/.github/workflows/scans.yml b/.github/workflows/scans.yml
@@ -22,6 +22,8 @@ jobs:
     name: Coverity
   call-coverage:
     uses: ./.github/workflows/scan_coverage.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     name: Coverage
   call-documentation:
     uses: ./.github/workflows/scan_documentation.yml

diff --git a/utils/docker/images/Dockerfile.ubuntu-22.04 b/utils/docker/images/Dockerfile.ubuntu-22.04
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016-2023, Intel Corporation
+# Copyright 2016-2024, Intel Corporation
 
 #
 # Dockerfile - a 'recipe' for Docker to build an image of ubuntu-based
@@ -83,9 +83,6 @@ ENV PYTHON_DEPS "\
 # Copy install valgrind script
 COPY install-valgrind.sh install-valgrind.sh
 
-# Copy script to download codecov script required in run-coverage.sh
-COPY download-scripts.sh download-scripts.sh
-
 # Update the Apt cache and install basic tools
 RUN apt-get update && apt-get dist-upgrade -y \
 	&& apt-get install -y --no-install-recommends \
@@ -100,7 +97,6 @@ RUN apt-get update && apt-get dist-upgrade -y \
 	$COVERITY_DEPS \
 	$MISC_DEPS \
 	&& ./install-valgrind.sh ubuntu \
-	&& ./download-scripts.sh \
 	&& rm -rf /var/lib/apt/lists/*
 
 RUN pip3 install $PYTHON_DEPS

diff --git a/utils/docker/images/download-scripts.sh b/utils/docker/images/download-scripts.sh
diff --git a/utils/docker/run-coverage.sh b/utils/docker/run-coverage.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017-2023, Intel Corporation
+# Copyright 2017-2024, Intel Corporation
 
 #
 # run-coverage.sh - is called inside a Docker container; runs tests
@@ -35,17 +35,3 @@ popd
 # prepare flag for codecov report to differentiate builds
 flag=tests
 [ -n "${GITHUB_ACTIONS}" ] && flag=GHA
-
-# validate codecov.yaml file
-cat "${WORKDIR}/.codecov.yml" | curl --data-binary @- https://codecov.io/validate
-
-# run codecov's uploader in current dir (WORKDIR), with gcov executable
-# (clean parsed coverage files, set flag and exit 1 if not successful)
-/opt/scripts/codecov --rootDir . --gcov --clean --flags ${flag} --nonZero --verbose
-echo "Check for any leftover gcov files"
-leftover_files=$(find . -name "*.gcov")
-if [[ -n "${leftover_files}" ]]; then
-	# display found files and exit with error (they all should be parsed)
-	echo "${leftover_files}"
-	return 1
-fi