Merge master into features

Conflicts:
	src/_pytest/_code/code.py
	src/_pytest/main.py

.github/workflows/main.yml

@@ -45,6 +45,8 @@ jobs:
           "macos-py38",
 
           "linting",
+          "docs",
+          "doctesting",
         ]
 
         include:
@@ -114,7 +116,17 @@ jobs:
           - name: "linting"
             python: "3.7"
             os: ubuntu-latest
-            tox_env: "linting,docs,doctesting"
+            tox_env: "linting"
+            skip_coverage: true
+          - name: "docs"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "docs"
+            skip_coverage: true
+          - name: "doctesting"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "doctesting"
 
     steps:
     - uses: actions/checkout@v1
@@ -144,21 +156,11 @@ jobs:
       run: |
         python scripts/append_codecov_token.py
 
-    - name: Combine coverage
+    - name: Report coverage
       if: (!matrix.skip_coverage)
-      run: |
-        python -m coverage combine
-        python -m coverage xml
-
-    - name: Codecov upload
-      if: (!matrix.skip_coverage)
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.codecov }}
-        file: ./coverage.xml
-        flags: ${{ runner.os }}
-        fail_ci_if_error: false
-        name: ${{ matrix.name }}
+      env:
+        CODECOV_NAME: ${{ matrix.name }}
+      run: bash scripts/report-coverage.sh -F GHA,${{ runner.os }}
 
   deploy:
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && github.repository == 'pytest-dev/pytest'