From db9ac992561d2df21e900d34c9838e205abee22f Mon Sep 17 00:00:00 2001
From: Jade Welton <jawelton@microsoft.com>
Date: Fri, 6 Mar 2026 10:35:36 -0800
Subject: [PATCH] Try to fix coverage report merge.

---
 .github/workflows/ci.yml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf0e05da9..86ae8ccdb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -220,7 +220,7 @@ jobs:
         run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --workers=3
       - name: "Generate code coverage report for shard ${{ matrix['shardIndex'] }}"
         if: ${{ !cancelled() }}
-        run: npx nyc report --reporter=html --reporter=text --report-dir=coverage/shard-${{ matrix.shardIndex }}
+        run: npx nyc report --reporter=html --reporter=text --reporter=lcov --report-dir=coverage/shard-${{ matrix.shardIndex }}
       - name: Upload blob report to GitHub Actions Artifacts
         if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v4
@@ -235,13 +235,6 @@ jobs:
           name: coverage-report-${{ matrix.shardIndex }}
           path: coverage/shard-${{ matrix.shardIndex }}
           retention-days: 1
-      - name: Upload raw coverage data for merging
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: nyc-output-${{ matrix.shardIndex }}
-          path: .nyc_output
-          retention-days: 1
 
   merge-coverage-reports:
     name: "Merge Coverage Reports"
@@ -259,19 +252,15 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: all-coverage
-          pattern: nyc-output-*
+          pattern: coverage-report-*
           merge-multiple: true
-      - name: Move coverage files into .nyc_output
-        run: |
-          mkdir -p .nyc_output
-          cp all-coverage/*.json .nyc_output/
       - name: Generate merged coverage report
-        run: npx nyc report --reporter=html --reporter=text --reporter=lcov --report-dir=coverage-e2e
+        run: npx nyc merge all-coverage coverage.json
       - name: Upload merged coverage report
         uses: actions/upload-artifact@v4
         with:
           name: merged-coverage-report--attempt-${{ github.run_attempt }}
-          path: coverage-e2e
+          path: all-coverage
           retention-days: 14
 
   merge-playwright-reports: