Improvs final

Author: kamdubiel

.github/actions/test-coverage/action.yml

@@ -49,13 +49,3 @@ jobs:
       - name: 🏗️ Build packages
         run: pnpm build
         shell: bash
-
-  coverage:
-    permissions:
-      actions: read # download base coverage artifact via workflow run APIs
-      contents: read # checkout
-      pull-requests: write # comment coverage diff on PRs
-    uses: ./.github/workflows/coverage.yml
-    with:
-      monorepo: true
-      event-type: pr

.github/workflows/base-coverage.yml

@@ -1,22 +1,26 @@
-name: 📊 Coverage
+name: 📊 Tests & Coverage
+
+# Configuration
+# Set to 'true' for monorepo, 'false' for single repository
+env:
+  MONOREPO: 'false'
+  BASE_BRANCH: 'main'
 
 on:
-  workflow_call:
-    inputs:
-      monorepo:
-        description: 'Whether this is a monorepo (true) or single repo (false)'
-        required: false
-        type: boolean
-        default: false
-      event-type:
-        description: 'Type of event: pr or push'
-        required: true
-        type: string
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+concurrency:
+  group: coverage-${{ github.ref }}
+  cancel-in-progress: true
 
 permissions:
-  contents: read
-  actions: read
-  pull-requests: write
+  contents: read # required so checkout/actions using GITHUB_TOKEN can read repo
+  actions: read # required to download base coverage artifact via workflow run APIs
+  pull-requests: write # required to post/update coverage diff comments on PRs
 
 jobs:
   coverage:
@@ -25,6 +29,9 @@ jobs:
       actions: read # download base coverage artifact via workflow run APIs
       contents: read # checkout
       pull-requests: write # comment coverage diff on PRs
+    env:
+      EVENT_TYPE: ${{ github.event_name == 'push' && 'push' || 'pr' }}
+      # Workflow-level env variables (MONOREPO, BASE_BRANCH) are automatically inherited by jobs
     steps:
       - name: 📥 Checkout Repository
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
@@ -35,41 +42,47 @@ jobs:
       - name: 🧪 Test
         run: pnpm test:coverage
         shell: bash
+        # Note: If tests fail, the workflow will fail and coverage steps won't run.
+        # This ensures we only report coverage for passing tests.
 
-      - name: 📊 Aggregate coverage results
-        env:
-          MONOREPO: ${{ inputs.monorepo }}
+      - name: 📊 Aggregate coverage results and create summary
+        if: env.EVENT_TYPE == 'pr'
+        # MONOREPO is inherited from workflow-level env
         run: node scripts/aggregate-coverage-results.js
         shell: bash
 
       - name: 🔍 Locate base coverage workflow run
         id: locate-base-coverage
-        if: inputs.event-type == 'pr'
+        if: env.EVENT_TYPE == 'pr'
         uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         env:
-          BASE_WORKFLOW: base-coverage.yml
+          BASE_WORKFLOW: coverage.yml
+          # BASE_BRANCH is inherited from workflow-level env
         with:
           script: |
             const workflowId = process.env.BASE_WORKFLOW;
-            const baseSha = context.payload.pull_request.base.sha;
+            const baseBranch = process.env.BASE_BRANCH || 'main';
+
+            // Get the latest successful workflow run from the base branch
             const { data } = await github.rest.actions.listWorkflowRuns({
               owner: context.repo.owner,
               repo: context.repo.repo,
               workflow_id: workflowId,
-              head_sha: baseSha,
+              branch: baseBranch,
               per_page: 20,
             });
+
             const run = data.workflow_runs.find((run) => run.conclusion === 'success');
             if (run) {
-              core.info(`Found base coverage run ${run.id}`);
+              core.info(`Found base coverage run ${run.id} from ${baseBranch} branch`);
               core.setOutput('run-id', String(run.id));
             } else {
-              core.warning(`No successful base coverage run found for ${baseSha}`);
+              core.warning(`No successful base coverage run found for ${baseBranch} branch`);
               core.setOutput('run-id', '');
             }
 
       - name: 📥 Download base branch coverage artifact
-        if: inputs.event-type == 'pr' && steps.locate-base-coverage.outputs.run-id != ''
+        if: env.EVENT_TYPE == 'pr' && steps.locate-base-coverage.outputs.run-id != ''
         continue-on-error: true
         uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
@@ -79,19 +92,18 @@ jobs:
           run-id: ${{ steps.locate-base-coverage.outputs.run-id }}
 
       - name: 💬 Comment coverage diff
-        if: inputs.event-type == 'pr'
+        if: env.EVENT_TYPE == 'pr'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
           BASE_COVERAGE_ROOT: base-coverage
-          MONOREPO: ${{ inputs.monorepo }}
+          # MONOREPO and BASE_BRANCH are inherited from workflow-level env
         run: node scripts/comment-coverage-diff.js
         shell: bash
 
       - name: ♻️ Collect coverage summaries
-        if: inputs.event-type == 'push'
-        env:
-          MONOREPO: ${{ inputs.monorepo }}
+        if: env.EVENT_TYPE == 'push' && github.ref_name == 'main'
+        # MONOREPO is inherited from workflow-level env
         run: |
           rm -rf base-coverage
           if [ "$MONOREPO" = "true" ]; then
@@ -107,9 +119,9 @@ jobs:
         shell: bash
 
       - name: 📤 Upload coverage artifact
-        if: inputs.event-type == 'push'
+        if: env.EVENT_TYPE == 'push' && github.ref_name == 'main'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: base-coverage
           path: base-coverage
-          retention-days: 14
+          retention-days: 14 # Artifacts expire after 14 days. Adjust if needed, but note that PRs opened after expiration won't have base coverage to compare against.

.github/workflows/ci.yml

@@ -18,6 +18,7 @@ const MARKER = '<!-- coverage-diff -->';
 const SINGLE_REPO_PACKAGE_NAME = 'root';
 const PERCENTAGE_DECIMAL_PLACES = 2;
 const IS_MONOREPO = process.env.MONOREPO === 'true';
+const BASE_BRANCH_NAME = process.env.BASE_BRANCH || 'main';
 
 // ============================================================================
 // Configuration
@@ -136,7 +137,7 @@ function capitalize(str) {
  * @returns {string} Markdown table
  */
 function buildDiffTable(headTotals, baseTotals) {
-	let md = '| Metric | PR | main | Δ |\n';
+	let md = `| Metric | PR | ${BASE_BRANCH_NAME} | Δ |\n`;
 	md += '| ------ | ---: | ---: | ---: |\n';
 
 	COVERAGE_METRICS.forEach((metric) => {
@@ -175,7 +176,7 @@ function buildPerPackageTable(prPackages, basePackages) {
 		return null;
 	}
 
-	let md = '| Package | Metric | PR | main | Δ |\n';
+	let md = `| Package | Metric | PR | ${BASE_BRANCH_NAME} | Δ |\n`;
 	md += '| ------- | ------ | ---: | ---: | ---: |\n';
 
 	sortedNames.forEach((packageName) => {