Combine coverages for matrix.os

Author: hosaka

.github/workflows/main.yml

@@ -50,26 +50,57 @@ jobs:
         uses: astral-sh/setup-uv@v6
         with:
           version: "0.8.3"
-          enable-cache: false
+          enable-cache: true
 
       - name: Test python/qt combinations
         uses: coactions/setup-xvfb@v1
         with:
-          run: bash scripts/test-matrix.sh
+          run: bash scripts/test-matrix.sh --parallel
 
-  # combine-coverage:
-  #   needs: tests
-  #   name: combine and report coverage
-  #   runs-on: ubuntu-latest
-  #
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - run: pip install coverage
-  #
-  #     - name: Download all coverage artifacts
-  #       uses: actions/download-artifact@v4
-  #       with:
-  #         path: coverage-artifacts
-  #
-  #     - name: Comment with coverage report
-  #       uses: MishaKav/pytest-coverage-comment@v1
+      - name: Collect test coverage
+        run: |
+          uv run coverage combine --quiet
+          uv run coverage report --sort=cover
+          mv .coverage .coverage-${{ matrix.os }}
+
+      - name: Upload coverage artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-${{ matrix.os }}
+          path: .coverage-${{ matrix.os }}
+          include-hidden-files: true
+
+  combine-coverage:
+    needs: tests
+    name: combine and report test coverage
+    runs-on: ubuntu-latest
+    permissions:
+      # new comments in pull requests
+      pull-requests: write
+      # permissions for pushing to python-coverage-comment-action branch
+      # for editing existing comments
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Download coverage artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: coverage-*
+          merge-multiple: true
+
+      - name: Coverage report
+        uses: py-cov-action/python-coverage-comment-action@v3.35
+        with:
+          GITHUB_TOKEN: ${{ github.token }}
+          MERGE_COVERAGE_FILES: true
+
+      # - name: Collect test coverage
+      #   run: |
+      #     pip install coverage
+      #     coverage combine --quiet coverage/
+
+      # - name: Comment with coverage report
+      #   uses: MishaKav/pytest-coverage-comment@v1

scripts/test-matrix.sh

@@ -7,6 +7,8 @@ QT_VERSIONS=("pyside2" "pyside6" "pyqt5" "pyqt6")
 TARGET_OS="${GITHUB_MATRIX_OS:-$(uname | tr '[:upper:]' '[:lower:]')}"
 TARGET_ARCH="${GITHUB_MATRIX_ARCH:-$(uname -m)}"
 
+echo "Running on $TARGET_OS-$TARGET_ARCH"
+
 TEST_MATRIX=()
 for PY in "${PYTHON_VERSIONS[@]}"; do
   for QT in "${QT_VERSIONS[@]}"; do
@@ -46,8 +48,3 @@ done
 
 # run in parallel
 printf "%s\n" "${TEST_MATRIX[@]}" | xargs -n2 -P4 scripts/test-combo.sh
-
-# combine coverage
-uv run --active coverage combine --quiet
-uv run --active coverage report --sort=cover --show-missing
-# uv run --active coverage report --sort=cover --show-missing xml coverage.xml