From 72cfecd3fd2cad629ff24fab5a26c5f16a398b18 Mon Sep 17 00:00:00 2001
From: Andreas Abel <andreas.abel@ifi.lmu.de>
Date: Tue, 25 Jun 2024 09:11:01 +0200
Subject: [PATCH] CI: remove constraint-set containers-0.7

---
 .github/workflows/haskell-ci.yml |  8 --------
 cabal.haskell-ci                 | 18 +++++++++---------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index 1739225f..0023dedb 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -237,7 +237,6 @@ jobs:
           echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           cat >> cabal.project <<EOF
           constraints: base-compat >= 0.12.2
-          allow-newer: containers
           EOF
           $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(example-client|hackage-repo-tool|hackage-root-tool|hackage-security|hackage-security-HTTP|hackage-security-curl|hackage-security-http-client|precompute-fileinfo)$/; }' >> cabal.project.local
           cat cabal.project
@@ -293,13 +292,6 @@ jobs:
       - name: prepare for constraint sets
         run: |
           rm -f cabal.project.local
-      - name: constraint set containers-0.7
-        run: |
-          $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all --dry-run
-          cabal-plan topo | sort
-          $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' --dependencies-only -j2 all
-          $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all
-          $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all
       - name: constraint set no-lukko
         run: |
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='hackage-security -lukko' all --dry-run
diff --git a/cabal.haskell-ci b/cabal.haskell-ci
index 8e9d9035..a469d194 100644
--- a/cabal.haskell-ci
+++ b/cabal.haskell-ci
@@ -18,12 +18,12 @@ raw-project
 constraint-set no-lukko
   constraints: hackage-security -lukko
 
-constraint-set containers-0.7
-  -- Andreas, 2024-03-19: possibly we will have to turn off the constraint set
-  -- for the head.hackage build with GHC 9.10.0
-  -- ghc: < 9.10
-  constraints: containers >= 0.7
-  tests: True
-  run-tests: True
-raw-project
-  allow-newer: containers
+-- constraint-set containers-0.7
+--   -- Andreas, 2024-03-19: possibly we will have to turn off the constraint set
+--   -- for the head.hackage build with GHC 9.10.0
+--   -- ghc: < 9.10
+--   constraints: containers >= 0.7
+--   tests: True
+--   run-tests: True
+-- raw-project
+--   allow-newer: containers