Merge branch 'master' into circleci-pr

SHA1SUM

@@ -1 +1 @@
-ab4f592de013525b9b2e1999c3770b3e25b8ac3d  codecov
+25e47d940fbd29fc0f9acbfde3b447c152fd86dd  codecov

SHA256SUM

@@ -1 +1 @@
-9cc9b00b90035094675c3013c158e17c8a95fd5597015bdd8f3160ee33dfff4f  codecov
+863cc21a5ffb7e9ff6d0a2a3b9eac0dca7a0c798e6d75be1f0e393a5788f9f70  codecov

SHA512SUM

@@ -1 +1 @@
-a326d11131a6beb141dd9449ab839450bd69f556f9c5ab862356602ebf2660d1850544807de8e5731d6562e7b95264afc471e1f51b394dc8b5ebc7710c5696a8  codecov
+26c53443a52a73f3926b22c2103450a372507baeb747cd1b175a9eb607b8b5427a85d6e71d28737e735a164b47218b4228c0c8f786f83c5e14485d05db94a2f0  codecov

codecov

@@ -900,18 +900,7 @@ fi
 
 if [ "$commit_o" = "" ];
 then
-  # merge commit -> actual commit
-  mc=
-  if [ -n "$pr" ] && [ "$pr" != false ];
-  then
-    mc=$(git show --no-patch --format="%P" 2>/dev/null || echo "")
-  fi
-  if [[ "$mc" =~ ^[a-z0-9]{40}[[:space:]][a-z0-9]{40}$ ]];
-  then
-    mergecommit=${echo "$mc" | cut -d' ' -f2}
-    say "    Fixing merge commit SHA from $commit to $mergecommit"
-    commit=$mergecommit
-  elif [ "$GIT_COMMIT" != "" ];
+  if [ "$GIT_COMMIT" != "" ];
   then
     commit="$GIT_COMMIT"
   elif [ "$commit" = "" ];
@@ -1692,6 +1681,7 @@ else
           --retry 5 --retry-delay 2 --connect-timeout 2 \
           -H 'X-Reduced-Redundancy: false' \
           -H 'X-Content-Type: application/x-gzip' \
+          -H 'Content-Length: 0' \
           --write-out "\n%{response_code}\n" \
           "$url/upload/v4?$query" || true)
     # a good reply is "https://codecov.io" + "\n" + "https://storage.googleapis.com/codecov/..."

env

@@ -252,7 +252,7 @@ then
 
 elif [ "$GITHUB_ACTIONS" != '' ]
 then
-  add "GITHUB_ACTION"
+  add "GITHUB_ACTIONS"
   add "GITHUB_REF"
   add "GITHUB_REPOSITORY"
   add "GITHUB_HEAD_REF"