From 7fca215fa359de7d755dde4196e8380b50e0d7e7 Mon Sep 17 00:00:00 2001
From: Andreas Abel <andreas.abel@ifi.lmu.de>
Date: Tue, 3 Oct 2023 11:00:46 +0200
Subject: [PATCH] v0.5.3.0-r4: cassava 0.5.3.0 revision 4: allow containers-0.7

---
 .github/workflows/haskell-ci.yml | 41 +++++++++++++-------------------
 cabal.haskell-ci                 | 11 ++++++++-
 cassava.cabal                    | 10 ++++----
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index dcc3a4c..9564f3f 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -6,11 +6,11 @@
 #
 #   haskell-ci regenerate
 #
-# For more information, see https://github.com/haskell-CI/haskell-ci
+# For more information, see https://github.com/andreasabel/haskell-ci
 #
-# version: 0.17.20230827
+# version: 0.17.20231002
 #
-# REGENDATA ("0.17.20230827",["github","cassava.cabal"])
+# REGENDATA ("0.17.20231002",["github","cassava.cabal"])
 #
 name: Haskell-CI
 on:
@@ -27,19 +27,19 @@ jobs:
     timeout-minutes:
       60
     container:
-      image: buildpack-deps:bionic
+      image: buildpack-deps:focal
     continue-on-error: ${{ matrix.allow-failure }}
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.8.0.20230822
+          - compiler: ghc-9.8.0.20230929
             compilerKind: ghc
-            compilerVersion: 9.8.0.20230822
+            compilerVersion: 9.8.0.20230929
             setup-method: ghcup
             allow-failure: true
-          - compiler: ghc-9.6.2
+          - compiler: ghc-9.6.3
             compilerKind: ghc
-            compilerVersion: 9.6.2
+            compilerVersion: 9.6.3
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.4.7
@@ -92,21 +92,6 @@ jobs:
             compilerVersion: 7.10.3
             setup-method: hvr-ppa
             allow-failure: false
-          - compiler: ghc-7.8.4
-            compilerKind: ghc
-            compilerVersion: 7.8.4
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-7.6.3
-            compilerKind: ghc
-            compilerVersion: 7.6.3
-            setup-method: hvr-ppa
-            allow-failure: false
-          - compiler: ghc-7.4.2
-            compilerKind: ghc
-            compilerVersion: 7.4.2
-            setup-method: hvr-ppa
-            allow-failure: false
       fail-fast: false
     steps:
       - name: apt
@@ -225,7 +210,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
           cabal-plan --version
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
       - name: initial cabal.project for sdist
@@ -253,6 +238,7 @@ jobs:
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
           cat >> cabal.project <<EOF
           allow-newer: text
+          allow-newer: containers
           EOF
           if $HEADHACKAGE; then
           echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
@@ -297,6 +283,13 @@ jobs:
       - name: prepare for constraint sets
         run: |
           rm -f cabal.project.local
+      - name: constraint set containers-0.7
+        run: |
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.7' all --dry-run ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.7' --dependencies-only -j2 all ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.7' all ; fi
+          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.7' all ; fi
       - name: constraint set text-2.1
         run: |
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='text ^>=2.1' all --dry-run ; fi
diff --git a/cabal.haskell-ci b/cabal.haskell-ci
index 9a3e9eb..c160c16 100644
--- a/cabal.haskell-ci
+++ b/cabal.haskell-ci
@@ -7,4 +7,13 @@ constraint-set text-2.1
   run-tests: True
 
 raw-project
-  allow-newer: text
\ No newline at end of file
+  allow-newer: text
+
+constraint-set containers-0.7
+  ghc: >=8.2
+  constraints: containers ^>=0.7
+  tests: True
+  run-tests: True
+
+raw-project
+  allow-newer: containers
\ No newline at end of file
diff --git a/cassava.cabal b/cassava.cabal
index e9448dd..2ab7f27 100644
--- a/cassava.cabal
+++ b/cassava.cabal
@@ -45,7 +45,7 @@ Extra-source-files:  examples/*.hs,
                      README.md
 Tested-with:
   GHC == 9.8.0
-  GHC == 9.6.2
+  GHC == 9.6.3
   GHC == 9.4.7
   GHC == 9.2.8
   GHC == 9.0.2
@@ -56,9 +56,9 @@ Tested-with:
   GHC == 8.2.2
   GHC == 8.0.2
   GHC == 7.10.3
-  GHC == 7.8.4
-  GHC == 7.6.3
-  GHC == 7.4.2
+  -- GHC == 7.8.4
+  -- GHC == 7.6.3
+  -- GHC == 7.4.2
 
 ----------------------------------------------------------------------------
 
@@ -116,7 +116,7 @@ Library
     , array        >= 0.4      && < 0.6
     , attoparsec   >= 0.11.3.0 && < 0.15
     , bytestring   >= 0.9.2    && < 0.13
-    , containers   >= 0.4.2    && < 0.7
+    , containers   >= 0.4.2    && < 0.8
     , deepseq      >= 1.1      && < 1.6
     , hashable                    < 1.5
     , scientific   >= 0.3.4.7  && < 0.4