From 5330c16b7f2d1e1ab7b73592f497815f0cfd7b82 Mon Sep 17 00:00:00 2001
From: George Thomas <georgefsthomas@gmail.com>
Date: Mon, 16 Sep 2024 18:20:38 +0100
Subject: [PATCH 1/6] Rename GitHub workflow file

---
 .github/workflows/{haskell.yml => workflow.yaml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{haskell.yml => workflow.yaml} (100%)

diff --git a/.github/workflows/haskell.yml b/.github/workflows/workflow.yaml
similarity index 100%
rename from .github/workflows/haskell.yml
rename to .github/workflows/workflow.yaml

From 763b035b02513b3eccb11153aac6315efe4bf79d Mon Sep 17 00:00:00 2001
From: George Thomas <georgefsthomas@gmail.com>
Date: Mon, 16 Sep 2024 18:21:16 +0100
Subject: [PATCH 2/6] Bump cache action

---
 .github/workflows/workflow.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index e5275f7..35805a1 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -11,7 +11,7 @@ jobs:
     name: main
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set user input permissions
         run: sudo usermod -a -G input $USER
@@ -33,7 +33,7 @@ jobs:
           cabal build all --dry-run
 
       - name: Restore cached dependencies
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         id: cache
         env:
           key: ${{ runner.os }}-ghc-${{ steps.setup.outputs.ghc-version }}-cabal-${{ steps.setup.outputs.cabal-version }}
@@ -46,8 +46,8 @@ jobs:
         run: cabal build all --only-dependencies
 
       - name: Save cached dependencies
-        uses: actions/cache/save@v3
-        if: ${{ steps.cache.outputs.cache-primary-key != steps.cache.outputs.cache-matched-key }}
+        uses: actions/cache/save@v4
+        if: steps.cache.outputs.cache-hit != 'true'
         with:
           path: ${{ steps.setup.outputs.cabal-store }}
           key: ${{ steps.cache.outputs.cache-primary-key }}

From 56b5d994894a9fc4f246c8161a42b3ecfc4f29aa Mon Sep 17 00:00:00 2001
From: George Thomas <georgefsthomas@gmail.com>
Date: Mon, 16 Sep 2024 18:22:49 +0100
Subject: [PATCH 3/6] Check Cabal file and Haddocks

---
 .github/workflows/workflow.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index 35805a1..6f275bd 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -59,3 +59,9 @@ jobs:
         run: |
           cabal build test
           sudo $(cabal list-bin test)
+
+      - name: Check cabal file
+        run: cabal check
+
+      - name: Build documentation
+        run: cabal haddock all

From 7990ffc061b4dccae130216b5a9fa2a24947895e Mon Sep 17 00:00:00 2001
From: George Thomas <georgefsthomas@gmail.com>
Date: Mon, 16 Sep 2024 18:23:24 +0100
Subject: [PATCH 4/6] Bump CI GHC version

---
 .github/workflows/workflow.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index 6f275bd..f04c960 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -20,7 +20,7 @@ jobs:
         uses: haskell-actions/setup@v2
         id: setup
         with:
-          ghc-version: '9.4'
+          ghc-version: '9.6'
           cabal-version: '3.10'
           cabal-update: true
 

From 2f4992aeb5f5e7b3b9a3308353b693981c16bf61 Mon Sep 17 00:00:00 2001
From: George Thomas <georgefsthomas@gmail.com>
Date: Tue, 17 Sep 2024 10:05:25 +0100
Subject: [PATCH 5/6] Fix CI Cabal check

---
 .github/workflows/workflow.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index f04c960..f023c73 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -60,8 +60,8 @@ jobs:
           cabal build test
           sudo $(cabal list-bin test)
 
-      - name: Check cabal file
-        run: cabal check
+      - name: Check cabal files
+        run: (cd evdev && cabal check) && (cd evdev-streamly && cabal check)
 
       - name: Build documentation
         run: cabal haddock all

From e599fa433083b9c9cd0aad04c096920ed012a216 Mon Sep 17 00:00:00 2001
From: George Thomas <georgefsthomas@gmail.com>
Date: Tue, 17 Sep 2024 10:06:53 +0100
Subject: [PATCH 6/6] Correctly register doc files

As suggested by `cabal check`.
---
 evdev-streamly/evdev-streamly.cabal | 2 +-
 evdev/evdev.cabal                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/evdev-streamly/evdev-streamly.cabal b/evdev-streamly/evdev-streamly.cabal
index cd5f845..467571a 100644
--- a/evdev-streamly/evdev-streamly.cabal
+++ b/evdev-streamly/evdev-streamly.cabal
@@ -11,7 +11,7 @@ homepage:            https://github.com/georgefst/evdev
 license:             BSD-3-Clause
 license-file:        LICENSE
 category:            Streamly, System
-extra-source-files:
+extra-doc-files:
     CHANGELOG.md
     README.md
 
diff --git a/evdev/evdev.cabal b/evdev/evdev.cabal
index 25efdf8..86f2187 100644
--- a/evdev/evdev.cabal
+++ b/evdev/evdev.cabal
@@ -9,7 +9,7 @@ homepage:            https://github.com/georgefst/evdev
 license:             BSD-3-Clause
 license-file:        LICENSE
 category:            System
-extra-source-files:
+extra-doc-files:
     CHANGELOG.md
     README.md