From 7516c569f991e802128dc7ac02b377f1960f03e5 Mon Sep 17 00:00:00 2001
From: Bodigrim <andrew.lelechenko@gmail.com>
Date: Tue, 30 Jan 2024 20:20:16 +0000
Subject: [PATCH] Add more CI jobs for Windows and macOS

---
 .github/workflows/other.yml | 7 ++++++-
 zlib.cabal                  | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/other.yml b/.github/workflows/other.yml
index acc9dcb..b72e112 100644
--- a/.github/workflows/other.yml
+++ b/.github/workflows/other.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [windows-latest, macOS-latest]
-        ghc: ['latest']
+        ghc: ['7.10', '8.0', 'latest']
     steps:
     - uses: actions/checkout@v4
     - uses: haskell-actions/setup@v2
@@ -35,7 +35,12 @@ jobs:
         cabal get zlib-*.tar.gz
         cd zlib-*/
         cabal build
+    - name: Test
+      run: |
+        cd zlib-*/
+        cabal test
     - name: Haddock
+      if: matrix.ghc != '7.10'
       run: |
         cd zlib-*/
         cabal haddock
diff --git a/zlib.cabal b/zlib.cabal
index bf66684..1d37f82 100644
--- a/zlib.cabal
+++ b/zlib.cabal
@@ -90,6 +90,8 @@ library
                    bytestring >= 0.9 && < 0.13
 
   build-tools:     hsc2hs >= 0.67 && < 0.69
+  if os(windows) && impl(ghc < 8)
+    build-tools:     hsc2hs < 0.68.7
     -- GHC 7 ships hsc2hs-0.67
 
   -- use `includes:` to include them when compiling