Let the coverage workflow take care of everything about test coverage

dshukertjr · dshukertjr · commit 305164df8b3b · 2025-01-21T16:30:46.000+09:00
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -1,52 +1,59 @@
 name: Combined Coverage Report
 
 on:
-  workflow_run:
-    workflows:
-      - 'functions_client'
-      - 'gotrue'
-      - 'postgrest'
-      - 'realtime_client'
-      - 'storage_client'
-      - 'supabase'
-      - 'supabase_flutter'
-      - 'yet_another_json_isolate'
-    types:
-      - completed
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
-  combine-coverage:
+  coverage:
+    name: Generate Combined Coverage
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup Dart
-        uses: dart-lang/setup-dart@v1
-        with:
-          sdk: stable
-
-      - name: Install coverage tool
-        run: dart pub global activate coverage
-
-      - name: Create coverage directory
-        run: mkdir -p coverage
-
-      - name: Download coverage artifacts
-        uses: actions/download-artifact@v4
+      - uses: actions/checkout@v4
+      
+      - uses: subosito/flutter-action@v2
         with:
-          pattern: coverage-flutter-*
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id }}
-
+          flutter-version: '3.x'
+          channel: 'stable'
+          
+      - name: Install dependencies
+        run: |
+          dart pub global activate melos
+          dart pub global activate coverage
+          dart pub global activate combine_coverage
+          melos bootstrap
+          
+      - name: Run tests with coverage for all packages
+        run: |
+          # Create directory for combined coverage
+          mkdir coverage
+          
+          # Run tests for each package and generate coverage
+          cd packages
+          for d in */ ; do
+            cd "$d"
+            if [ -f "pubspec.yaml" ]; then
+              echo "Running tests for $d"
+              if [[ "$d" == "supabase_flutter/"* ]]; then
+                flutter test --coverage --concurrency=1
+              else
+                dart test --coverage=coverage
+                dart pub global run coverage:format_coverage --packages=.dart_tool/package_config.json --report-on=lib --lcov -o coverage/lcov.info -i coverage
+              fi
+            fi
+            cd ..
+          done
+          cd ..
+          
       - name: Combine coverage reports
         run: |
-          find coverage -name "lcov.info" -exec cat {} + > coverage/combined_lcov.info
-
-      - name: Upload combined coverage to Coveralls
-        uses: coverallsapp/github-action@master
+          dart pub global run combine_coverage:combine_coverage --repo-path="./" --output-directory="coverage"
+          
+      - name: Upload combined coverage report
+        uses: actions/upload-artifact@v4
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: coverage/combined_lcov.info
+          name: combined-coverage-report
+          path: coverage/lcov.info
diff --git a/.github/workflows/functions_client.yml b/.github/workflows/functions_client.yml
@@ -50,17 +50,4 @@ jobs:
         run: dart analyze
 
       - name: Run tests
-        run: dart test --coverage=./coverage
-
-      - name: Format coverage
-        if: ${{ matrix.sdk == 'stable'}}
-        run: |
-          dart pub global activate coverage
-          dart pub global run coverage:format_coverage --lcov --in="./coverage/test" --out="./coverage/lcov.info" --report-on="./lib"
-
-      - name: Upload coverage artifact
-        if: ${{ matrix.sdk == 'stable'}}
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-flutter-functions-client
-          path: ./packages/functions_client/coverage/lcov.info
+        run: dart test
diff --git a/.github/workflows/gotrue.yml b/.github/workflows/gotrue.yml
@@ -60,16 +60,4 @@ jobs:
           time: '5s'
 
       - name: Run tests
-        run: dart test --concurrency=1 --coverage=./coverage
-
-      - name: Format coverage
-        run: |
-          dart pub global activate coverage
-          dart pub global run coverage:format_coverage --lcov --in="./coverage/test" --out="./coverage/lcov.info" --report-on="./lib"
-
-      - name: Upload coverage artifact
-        if: ${{ matrix.sdk == 'stable'}}
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-flutter-gotrue
-          path: ./packages/gotrue/coverage/lcov.info
+        run: dart test --concurrency=1
diff --git a/.github/workflows/postgrest.yml b/.github/workflows/postgrest.yml
@@ -60,16 +60,4 @@ jobs:
           time: '5s'
 
       - name: Run tests
-        run: dart test --concurrency=1 --coverage=./coverage
-
-      - name: Format coverage
-        run: |
-          dart pub global activate coverage
-          dart pub global run coverage:format_coverage --lcov --in="./coverage/test" --out="./coverage/lcov.info" --report-on="./lib"
-
-      - name: Upload coverage artifact
-        if: ${{ matrix.sdk == 'stable'}}
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-flutter-postgrest
-          path: ./packages/postgrest/coverage/lcov.info
+        run: dart test --concurrency=1
diff --git a/.github/workflows/realtime_client.yml b/.github/workflows/realtime_client.yml
@@ -49,16 +49,4 @@ jobs:
         run: dart analyze
 
       - name: Run tests
-        run: dart test --concurrency=1 --coverage=./coverage
-
-      - name: Format coverage
-        run: |
-          dart pub global activate coverage
-          dart pub global run coverage:format_coverage --lcov --in="./coverage/test" --out="./coverage/lcov.info" --report-on="./lib"
-
-      - name: Upload coverage artifact
-        if: ${{ matrix.sdk == 'stable'}}
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-flutter-realtime-client
-          path: ./packages/realtime_client/coverage/lcov.info
+        run: dart test --concurrency=1
diff --git a/.github/workflows/storage_client.yml b/.github/workflows/storage_client.yml
@@ -60,16 +60,4 @@ jobs:
           time: '5s'
 
       - name: Run tests
-        run: dart test --coverage=./coverage
-
-      - name: Format coverage
-        run: |
-          dart pub global activate coverage
-          dart pub global run coverage:format_coverage --lcov --in="./coverage/test" --out="./coverage/lcov.info" --report-on="./lib"
-
-      - name: Upload coverage artifact
-        if: ${{ matrix.sdk == 'stable'}}
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-flutter-storage-client
-          path: ./packages/storage_client/coverage/lcov.info
+        run: dart test
diff --git a/.github/workflows/supabase.yml b/.github/workflows/supabase.yml
@@ -49,16 +49,4 @@ jobs:
         run: dart analyze
 
       - name: Run tests
-        run: dart test --concurrency=1 --coverage=./coverage
-
-      - name: Format coverage
-        run: |
-          dart pub global activate coverage
-          dart pub global run coverage:format_coverage --lcov --in="./coverage/test" --out="./coverage/lcov.info" --report-on="./lib"
-
-      - name: Upload coverage artifact
-        if: ${{ matrix.sdk == 'stable'}}
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-flutter-supabase
-          path: ./packages/supabase/coverage/lcov.info
+        run: dart test --concurrency=1
diff --git a/.github/workflows/supabase_flutter.yml b/.github/workflows/supabase_flutter.yml
@@ -47,7 +47,7 @@ jobs:
         run: flutter analyze --fatal-warnings --fatal-infos .
 
       - name: Run tests
-        run: flutter test --concurrency=1 --coverage
+        run: flutter test --concurrency=1
 
       - name: Run tests with downgraded app_links
         run: |
@@ -57,11 +57,4 @@ jobs:
       - name: Verify if Flutter web build is successful
         run: |
           cd example
-          flutter build web
-
-      - name: Upload coverage artifact
-        if: ${{ matrix.sdk == 'stable'}}
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-flutter-supabase-flutter
-          path: ./packages/supabase_flutter/coverage/lcov.info
+          flutter build web
diff --git a/.github/workflows/yet_another_json_isolate.yml b/.github/workflows/yet_another_json_isolate.yml
@@ -49,16 +49,4 @@ jobs:
         run: dart analyze
 
       - name: Run tests
-        run: dart test --coverage=./coverage
-
-      - name: Format coverage
-        run: |
-          dart pub global activate coverage
-          dart pub global run coverage:format_coverage --lcov --in="./coverage/test" --out="./coverage/lcov.info" --report-on="./lib"
-
-      - name: Upload coverage artifact
-        if: ${{ matrix.sdk == 'stable'}}
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-flutter-yet-another-json-isolate
-          path: ./packages/yet_another_json_isolate/coverage/lcov.info
+        run: dart test
