Merge pull request #29941 from code-dot-org/unit-tests-dont-merge-sta…

…ging

Don't merge from staging before unit tests on drone

.drone.yml

@@ -14,10 +14,6 @@ steps:
   # Also fetch the target branch (which is staging for pull requests.) We need this for determining which tests to run based on changed files.
   - git remote set-branches --add origin $DRONE_TARGET_BRANCH
   - git fetch --depth 100 origin $DRONE_TARGET_BRANCH
-  # Merge so we're up-to-date with the target before running tests.
-  - git config user.name "Drone"
-  - git config user.email "drone-fake-user@code.org"
-  - git merge origin/$DRONE_TARGET_BRANCH
 
 - name: verify-pr
   image: joshlory/code-dot-org:0.10
@@ -114,7 +110,8 @@ steps:
   # Also fetch the target branch (which is staging for pull requests.) We need this for determining which tests to run based on changed files.
   - git remote set-branches --add origin $DRONE_TARGET_BRANCH
   - git fetch --depth 100 origin $DRONE_TARGET_BRANCH
-  # Merge so we're up-to-date with the target before running tests.
+  # Merge so we're up-to-date with the target before running tests. We only do this for UI tests, not unit tests,
+  # since it disrupts Codecov pull request reports.
   - git config user.name "Drone"
   - git config user.email "drone-fake-user@code.org"
   - git merge origin/$DRONE_TARGET_BRANCH
@@ -199,6 +196,6 @@ trigger:
   - pull_request
 ---
 kind: signature
-hmac: 79d4be8e9397ef07b8896318ddfc617abda7f25e95a773604ddad6865c531d9e
+hmac: e1f0041c4f9eaf8cfb2bf8d7aad6935f832708735c1830480aa51c3fc89acdf7
 
 ...