Merge pull request #2031 from wilzbach/update-codecov

Update CodeCov config
merged-on-behalf-of: Petar Kirov <ZombineDev@users.noreply.github.com>

Author: dlang-bot

.circleci/run.sh

@@ -73,12 +73,9 @@ setup_repos() {
    # merge upstream branch with changes, s.t. we check with the latest changes
     if [ -n "${CIRCLE_PR_NUMBER:-}" ]; then
         local head=$(git rev-parse HEAD)
-        git fetch https://github.com/dlang/$CIRCLE_PROJECT_REPONAME.git $base_branch
+        git remote add upstream "https://github.com/dlang/$CIRCLE_PROJECT_REPONAME.git"
+        git fetch -q upstream "+refs/pull/${CIRCLE_PR_NUMBER}/merge:"
         git checkout -f FETCH_HEAD
-        local base=$(git rev-parse HEAD)
-        git config user.name 'CI'
-        git config user.email '<>'
-        git merge -m "Merge $head into $base" $head
     fi
 
     for proj in dmd ; do

.codecov.yml

@@ -2,8 +2,30 @@
 
 codecov:
   notify:
+    # We don't want to wait for the CodeCov report
+    # See https://github.com/codecov/support/issues/312
+    require_ci_to_pass: false
     after_n_builds: 1  # send notifications after the first upload
+    wait_for_ci: false
+
   bot: dlang-bot
+  ci:
+    # https://docs.codecov.io/docs/detecting-ci-services
+    # Only CircleCi generates coverages files atm.
+    # Don't wait for the other CIs
+    - circleci.com
+    - !dtest.dlang.io
+    - !auto-tester.puremagic.com
+    - !appveyor.com
+    - !ci.dlang.io
+    - !travis-ci.org
+
+  # At CircleCi, the PR is merged into `master` before the testsuite is run.
+  # This allows CodeCov to adjust the resulting coverage diff, s.t. it matches
+  # with the GitHub diff.
+  # https://github.com/codecov/support/issues/363
+  # https://docs.codecov.io/v4.3.6/docs/comparing-commits
+  allow_coverage_offsets: true
 
 coverage:
   precision: 3