Merge pull request #40 from andreasabel/loosen-bounds

Relax bounds so `compdata` builds with GHC-shipped core libraries
pa-ba · Oct 20, 2023 · e916a9a · e916a9a
2 parents b0aa3a2 + 50c7527
commit e916a9a
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,23 +23,76 @@ jobs:
     env:
       CONFIG: "--enable-tests"
     steps:
-      - uses: actions/checkout@v3
-      - uses: haskell/actions/setup@v2
+      - uses: actions/checkout@v4
+      - uses: haskell-actions/setup@v2
         id: setup-haskell-cabal
         with:
-          ghc-version: ${{ matrix.ghc }}
+          ghc-version:   ${{ matrix.ghc }}
           cabal-version: ${{ matrix.cabal }}
-      - run: cabal update
-      - run: cabal freeze $CONFIG
+          cabal-update:  true
+      - name: Configure
+        run: cabal configure $CONFIG
+      - name: Ensure buildability with GHC-shipped versions of dependencies
+        # Fix all GHC-shipped libraries to their installed version.
+        # This list is a superset of libraries that are actually used during the build,
+        # but this does not matter, as it does not entail that all these libraries are built.
+        run: |
+          cat >> cabal.project.local <<EOF
+          constraints:  Cabal              installed
+          constraints:  Cabal-syntax       installed
+          constraints:  array              installed
+          constraints:  base               installed
+          constraints:  binary             installed
+          constraints:  bytestring         installed
+          constraints:  containers         installed
+          constraints:  deepseq            installed
+          constraints:  directory          installed
+          constraints:  exceptions         installed
+          constraints:  filepath           installed
+          constraints:  ghc                installed
+          constraints:  ghc-bignum         installed
+          constraints:  ghc-boot           installed
+          constraints:  ghc-boot-th        installed
+          constraints:  ghc-compact        installed
+          constraints:  ghc-heap           installed
+          constraints:  ghc-prim           installed
+          constraints:  ghci               installed
+          constraints:  haskeline          installed
+          constraints:  hpc                installed
+          constraints:  integer-gmp        installed
+          constraints:  libiserv           installed
+          constraints:  mtl                installed
+          constraints:  parsec             installed
+          constraints:  pretty             installed
+          constraints:  process            installed
+          constraints:  rts                installed
+          constraints:  semaphore-compat   installed
+          constraints:  stm                installed
+          constraints:  system-cxx-std-lib installed
+          constraints:  template-haskell   installed
+          constraints:  terminfo           installed
+          constraints:  text               installed
+          constraints:  time               installed
+          constraints:  transformers       installed
+          constraints:  unix               installed
+          constraints:  xhtml              installed
+          EOF
+      - name: Construct the build plan
+        run: cabal build --dry-run
+        # The dry-run generates the build plan 'dist-newstyle/cache/plan.json'.
+        # The freeze file is not suitable for a cache key as it contains the hackage timestamp,
+        # which updates for every run of this action (via `cabal update`).
       - uses: actions/cache@v3
+        env:
+          key: ${{ runner.os }}-ghc-${{ steps.setup-haskell-cabal.outputs.ghc-version }}-cabal-${{ steps.setup-haskell-cabal.outputs.cabal-version }}
         with:
           path: |
             ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
             dist-newstyle
-          key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-${{ hashFiles('cabal.project.freeze') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-
-      - run: cabal build $CONFIG
-      - run: cabal test $CONFIG
-      - run: cabal haddock $CONFIG
+          key:          ${{ env.key }}-plan-${{ hashfiles('dist-newstyle/cache/plan.json') }}
+          restore-keys: ${{ env.key }}-
+      - run: cabal build --dependencies-only
+      - run: cabal build
+      - run: cabal test
+      - run: cabal haddock
       - run: cabal sdist
diff --git a/compdata.cabal b/compdata.cabal
@@ -187,15 +187,15 @@ library
 
 
 
-  Build-Depends:        base >= 4.16 && < 4.20,
-                        QuickCheck >= 2.14.3 && < 2.15,
-                        containers >= 0.6.8 && < 0.7,
-                        deepseq >= 1.4 && < 1.6,
-                        template-haskell >= 2.17 && < 2.22,
-                        mtl >= 2.3.1 && < 2.4,
-                        transformers >= 0.6.1 && < 0.7,
-                        th-expand-syns >= 0.4.11 && < 0.5,
-                        tree-view >= 0.5.1 && < 0.6
+  Build-Depends:        base             >= 4.16   && < 4.20,
+                        QuickCheck       >= 2.14.3 && < 2.15,
+                        containers       >= 0.6.5  && < 0.8,
+                        deepseq          >= 1.4    && < 1.6,
+                        template-haskell >= 2.17   && < 2.22,
+                        mtl              >= 2.2.2  && < 2.4,
+                        transformers     >= 0.5.6  && < 0.7,
+                        th-expand-syns   >= 0.4.11 && < 0.5,
+                        tree-view        >= 0.5.1  && < 0.6
 
   Default-Language:     Haskell2010
   Default-Extensions:   FlexibleContexts
@@ -207,9 +207,17 @@ Test-Suite test
   Type:                 exitcode-stdio-1.0
   Main-is:		Data_Test.hs
   hs-source-dirs:	testsuite/tests examples src
-  Build-Depends:        base >= 4.16 && < 5, template-haskell, containers, mtl >= 2.2.1,
-                        QuickCheck >= 2, HUnit, test-framework, test-framework-hunit,
-                        test-framework-quickcheck2 >= 0.3, deepseq, transformers, th-expand-syns
+  Build-Depends:        base >= 4.16 && < 5,
+                        HUnit,
+                        QuickCheck >= 2,
+                        containers, mtl >= 2.2.1,
+                        deepseq,
+                        template-haskell,
+                        test-framework,
+                        test-framework-hunit,
+                        test-framework-quickcheck2 >= 0.3,
+                        th-expand-syns,
+                        transformers
   Default-Language:     Haskell2010
 
   ghc-options:          -W -Wno-incomplete-patterns