resolve merge conflict

Author: daniel-sanche

.github/workflows/unittest.yml

@@ -191,19 +191,21 @@ jobs:
                 pkg_status="/tmp/coverage-logs/${pkg//\//_}.status"
 
                 set +e
-                if [ -f "${pkg}/.coveragerc" ]; then
+                pushd "${pkg}" > /dev/null
+                if [ -f ".coveragerc" ]; then
                   echo "Using package-specific configuration: ${pkg}/.coveragerc" > "${pkg_log}"
-                  if grep -q "fail_under" "${pkg}/.coveragerc"; then
-                    coverage report --rcfile="${pkg}/.coveragerc" --include="${pkg}/**" >> "${pkg_log}" 2>&1
+                  if grep -q "fail_under" ".coveragerc"; then
+                    COVERAGE_FILE=../../.coverage coverage report --rcfile=".coveragerc" --include="$PWD/**" >> "${pkg_log}" 2>&1
                   else
                     echo "No fail_under specified in ${pkg}/.coveragerc, enforcing default" >> "${pkg_log}"
-                    coverage report --rcfile="${pkg}/.coveragerc" --include="${pkg}/**" --fail-under="${DEFAULT_FAIL_UNDER}" >> "${pkg_log}" 2>&1
+                    COVERAGE_FILE=../../.coverage coverage report --rcfile=".coveragerc" --include="$PWD/**" --fail-under="${DEFAULT_FAIL_UNDER}" >> "${pkg_log}" 2>&1
                   fi
                 else
                   echo "No .coveragerc found for ${pkg}, enforcing default" > "${pkg_log}"
-                  coverage report --include="${pkg}/**" --fail-under="${DEFAULT_FAIL_UNDER}" >> "${pkg_log}" 2>&1
+                  COVERAGE_FILE=../../.coverage coverage report --include="$PWD/**" --fail-under="${DEFAULT_FAIL_UNDER}" >> "${pkg_log}" 2>&1
                 fi
                 echo $? > "${pkg_status}"
+                popd > /dev/null
                 set -e
               ) &
             fi