Compare result to master

Author: MaximilianAlgehed

.github/workflows/haskell-ci.yml

@@ -20,20 +20,28 @@ concurrency:
 
 jobs:
   linux:
-    name: Haskell-CI - Linux - ${{ matrix.ghc-version }}
+    name: Haskell-CI - ${{ matrix.ghc-version }} - ${{ matrix.ref }}
 
     strategy:
       matrix:
-        ghc-version: [latest, 9.12, "9.10", 9.8, 9.6]
+        ghc-version: ["9.12", "9.10", "9.8", "9.6"]
+        ref: ["${{ github.head_ref }}"]
+        include:
+          - ghc-version: "9.12"
+            ref: master
       fail-fast: false
 
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ matrix.ref }}
+
       - uses: haskell-actions/setup@v2
         with:
           ghc-version: ${{matrix.ghc-version}}
+
       - uses: actions/cache@v4
         with:
           key: ${{ matrix.ghc-version }}-${{ github.sha }}
@@ -42,22 +50,41 @@ jobs:
             dist-newstyle
             .hpc
           restore-keys: ${{ matrix.ghc-version }}-
-      - run: cabal build all --ghc-options=-fhpc
-      - run: cabal test all --ghc-options=-fhpc
-      - run: ./scripts/generate-coverage-comment.sh constrained.tix > coverage-report.md
-      - run: cat coverage-report.md
-      - run: cabal haddock all --ghc-options=-fhpc
+
+      - if: ${{ github.event.pull_request }}
+        run: |
+          cat <<EOF >>cabal.project.local
+          program-options
+            ghc-options: -fhpc
+          EOF
+
+      - run: cabal build all
+      - run: cabal test all
+      - run: cabal haddock all
+
+      # To get the right version of `generate-coverage-comment.sh`
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          sparse-checkout:
+            scripts
+          clean: false
+
+      - if: ${{ github.event.pull_request }}
+        run: ./scripts/generate-coverage-comment.sh constrained.tix | tee coverage-report-${{matrix.ref}}.md
+
       - name: Upload coverage report
+        if: ${{ github.event.pull_request }}
         uses: actions/upload-artifact@v4
         with:
-          name: constrained-${{matrix.ghc-version}}-coverage
-          path: coverage-report.md
+          name: constrained-${{matrix.ref}}-${{matrix.ghc-version}}-coverage
+          path: coverage-report-${{matrix.ref}}.md
           if-no-files-found: error
           compression-level: 0
           retention-days: 1
 
   report:
-    name: Generate coverage report
+    name: Generate coverage comment
 
     if: github.event.pull_request
 
@@ -69,10 +96,21 @@ jobs:
       - name: Download coverage report
         uses: actions/download-artifact@v4
         with:
-          pattern: 'constrained-latest-coverage'
+          pattern: 'constrained-${{github.head_ref}}-9.12-coverage'
+          merge-multiple: true
+
+      - name: Download coverage report
+        uses: actions/download-artifact@v4
+        with:
+          pattern: 'constrained-master-9.12-coverage'
           merge-multiple: true
 
-      - run: cat coverage-report.md
+      - run: |
+          cat coverage-report-${{github.head_ref}}.md > coverage-report.md
+          echo "# On master" >> coverage-report.md
+          cat coverage-report-master.md >> coverage-report.md
+          cat coverage-report.md
+
 
       - name: Find Comment
         uses: peter-evans/find-comment@v3

scripts/generate-coverage-comment.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 echo "# Coverage report"
-hpc report $1 | awk '{sub(/^[ \t]*/, "& - ")1; sub(/^  /, "", $0); print}'
+hpc report "$1" | awk '{sub(/^[ \t]*/, "&- "); sub(/^ /, ""); print}'