ci: working on connection/crypton-connection handling

codedownio · Jul 24, 2024 · 3de4e40 · 3de4e40
1 parent e44df88
commit 3de4e40
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 14 deletions.
diff --git a/cabal.project b/cabal.project
@@ -55,7 +55,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/codedownio/minio-hs.git
-  tag: 1e63a0ec44fff374799b25a0a02c041eab664c4f
+  tag: 2fae6ae212a346acf400847d0b6cc647045822d1
 
 source-repository-package
   type: git

diff --git a/sandwich-contexts/lib/Test/Sandwich/Contexts/Waits.hs b/sandwich-contexts/lib/Test/Sandwich/Contexts/Waits.hs
@@ -38,9 +38,11 @@ import UnliftIO.Exception
 import UnliftIO.Retry
 import UnliftIO.Timeout
 
+#ifdef MIN_VERSION_crypton_connection
 #if MIN_VERSION_crypton_connection(0,4,0)
 import Data.Default (def)
 #endif
+#endif
 
 
 -- | Keep trying an action up to a timeout while it fails with a 'FailureReason'.
@@ -99,8 +101,10 @@ tlsNoVerifySettings = mkManagerSettings tlsSettings Nothing
       settingDisableCertificateValidation = True
       , settingDisableSession = False
       , settingUseServerName = False
+#ifdef MIN_VERSION_crypton_connection
 #if MIN_VERSION_crypton_connection(0,4,0)
       , settingClientSupported = def
+#endif
 #endif
       }
 

diff --git a/sandwich-contexts/package.yaml b/sandwich-contexts/package.yaml
@@ -46,9 +46,7 @@ library:
   - conduit
   - conduit-extra
   - containers
-  - crypton-connection
   - exceptions
-  - data-default
   - filepath
   - http-client
   - http-conduit
@@ -75,6 +73,13 @@ library:
   - condition: "!os(windows)"
     exposed-modules:
     - Test.Sandwich.Contexts.PostgreSQL
+  - condition: "impl(ghc >= 9.6)"
+    dependencies:
+    - crypton-connection
+    - data-default
+  - condition: "impl(ghc < 9.6)"
+    dependencies:
+    - connection
 
 tests:
   tests:

diff --git a/sandwich-contexts/sandwich-contexts.cabal b/sandwich-contexts/sandwich-contexts.cabal
@@ -54,8 +54,6 @@ library
     , conduit
     , conduit-extra
     , containers
-    , crypton-connection
-    , data-default
     , exceptions
     , filepath
     , http-client
@@ -84,6 +82,13 @@ library
   if !os(windows)
     exposed-modules:
         Test.Sandwich.Contexts.PostgreSQL
+  if impl(ghc >= 9.6)
+    build-depends:
+        crypton-connection
+      , data-default
+  if impl(ghc < 9.6)
+    build-depends:
+        connection
 
 test-suite tests
   type: exitcode-stdio-1.0

diff --git a/stack.yaml b/stack.yaml
@@ -67,7 +67,8 @@ extra-deps:
 ## For sandwich-contexts
 
 - git: https://github.com/codedownio/minio-hs
-  commit: 1e63a0ec44fff374799b25a0a02c041eab664c4f
+  # branch: codedown-jul-2024-tolerant
+  commit: 2fae6ae212a346acf400847d0b6cc647045822d1
 
 ## For sandwich-contexts-docker
 

diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -12,15 +12,15 @@ packages:
   original:
     hackage: vty-windows-0.2.0.0
 - completed:
-    commit: 1e63a0ec44fff374799b25a0a02c041eab664c4f
+    commit: 2fae6ae212a346acf400847d0b6cc647045822d1
     git: https://github.com/codedownio/minio-hs
     name: minio-hs
     pantry-tree:
-      sha256: 6487e6cdf336fda12f9f4e88fb8edc17b3fd32e3f837b5a143237c3d80498929
+      sha256: 62258fb7a35375b89bc1926d5ee21038a723a040a2b826b6dc6c1a474bc94462
       size: 4744
     version: 1.7.0
   original:
-    commit: 1e63a0ec44fff374799b25a0a02c041eab664c4f
+    commit: 2fae6ae212a346acf400847d0b6cc647045822d1
     git: https://github.com/codedownio/minio-hs
 - completed:
     commit: f924f3262ef1dc5474f1b0ae3b60094376dca51e
@@ -34,20 +34,20 @@ packages:
     commit: f924f3262ef1dc5474f1b0ae3b60094376dca51e
     git: https://github.com/codedownio/docker-openapi.git
 - completed:
-    commit: 47d88d7061cda5227c8f7819e3a640c7dea247f3
+    commit: a747f6fdc62d34c684709740422497d3c088f8d9
     git: https://github.com/codedownio/kubernetes-client-haskell.git
     name: kubernetes-client-core
     pantry-tree:
-      sha256: 7dc8b722610d72138a66aaf6df67a63fe8ca847fdee565b3e0eda0e070e9d526
+      sha256: d807cb64b68b4211e9f793be63eb4b01cd3325ef0b36d750dd35fe09a875ac38
       size: 6710
     subdir: kubernetes-1.27
     version: 1.27.0
   original:
-    commit: 47d88d7061cda5227c8f7819e3a640c7dea247f3
+    commit: a747f6fdc62d34c684709740422497d3c088f8d9
     git: https://github.com/codedownio/kubernetes-client-haskell.git
     subdir: kubernetes-1.27
 - completed:
-    commit: 47d88d7061cda5227c8f7819e3a640c7dea247f3
+    commit: a747f6fdc62d34c684709740422497d3c088f8d9
     git: https://github.com/codedownio/kubernetes-client-haskell.git
     name: kubernetes-client
     pantry-tree:
@@ -56,7 +56,7 @@ packages:
     subdir: kubernetes-client
     version: 0.5.0.0
   original:
-    commit: 47d88d7061cda5227c8f7819e3a640c7dea247f3
+    commit: a747f6fdc62d34c684709740422497d3c088f8d9
     git: https://github.com/codedownio/kubernetes-client-haskell.git
     subdir: kubernetes-client
 - completed: