More work on CI, minio-hs compat

codedownio · Jul 20, 2024 · 5f973b9 · 5f973b9
1 parent 27d057c
commit 5f973b9
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 164 deletions.
diff --git a/.github/workflows/sandwich.yml b/.github/workflows/sandwich.yml
@@ -13,8 +13,8 @@ jobs:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
         ghc:
-        - "8.6.5"
-        - "8.8.4"
+        # - "8.6.5"
+        # - "8.8.4"
         - "8.10.7"
         - "9.0.2"
         - "9.2.8"
@@ -34,6 +34,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - uses: cachix/install-nix-action@v27
+      with:
+        # release-24.05
+        nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/74435c9234c751e6786c5f3fd34ff6b0f0c13bd1.tar.gz
+
     - uses: haskell/actions/setup@v2
       id: setup-haskell-cabal
       name: Setup Haskell
@@ -51,6 +56,12 @@ jobs:
         path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
         key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
 
+    - name: Install pcre
+      if: runner.os == "macOS"
+      run: |
+        brew update
+        brew install pcre
+
     - name: Build
       run: |
         cabal configure --enable-tests --enable-benchmarks --test-show-details=direct
@@ -72,7 +83,7 @@ jobs:
         - ghc: "9.4.8"
           yaml: "stack-9.4.8.yaml"
         - ghc: "9.6.5"
-          yaml: "stack-9.6.5.yaml"
+          yaml: "stack.yaml"
         - ghc: "9.8.1"
           yaml: "stack-9.8.1.yaml"
 

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: 768665c90321d118fdd3cde2c6ac6c01310d76a0
+  tag: 1e63a0ec44fff374799b25a0a02c041eab664c4f
 
 source-repository-package
   type: git

diff --git a/demos/demo-webdriver-pool/app/Main.hs b/demos/demo-webdriver-pool/app/Main.hs
@@ -44,7 +44,7 @@ introduceWebDriverPool :: forall m context. (
   ) => Int -> WdOptions -> SpecFree (LabelValue "webDriverPool" (Pool WebDriver) :> context) m () -> SpecFree context m ()
 introduceWebDriverPool poolSize wdOptions' = introduceWith "Introduce webdriver pool" webDriverPool $ \action -> do
   wdOptions <- addCommandLineOptionsToWdOptions <$> getSomeCommandLineOptions <*> pure wdOptions'
-  bracket (newPool =<< mkSafeDefaultPoolConfig (allocateWebDriver wdOptions) cleanupWebDriver 30.0 poolSize) destroyAllResources $ \pool ->
+  bracket (newPool =<< mkSafeDefaultPoolConfig (allocateWebDriver wdOptions defaultOnDemandOptions) cleanupWebDriver 30.0 poolSize) destroyAllResources $ \pool ->
     void $ action pool
 
   where

diff --git a/sandwich-webdriver/src/Test/Sandwich/WebDriver/Internal/Types.hs b/sandwich-webdriver/src/Test/Sandwich/WebDriver/Internal/Types.hs
@@ -76,6 +76,10 @@ data OnDemandOptions = OnDemandOptions {
   -- | How to obtain Xvfb binary.
   , xvfbToUse :: XvfbToUse
   }
+defaultOnDemandOptions = OnDemandOptions {
+  ffmpegToUse = UseFfmpegFromPath
+  , xvfbToUse = UseXvfbFromPath
+  }
 
 data HeadlessConfig = HeadlessConfig {
   headlessResolution :: Maybe (Int, Int)

diff --git a/sandwich-webdriver/src/Test/Sandwich/WebDriver/Types.hs b/sandwich-webdriver/src/Test/Sandwich/WebDriver/Types.hs
@@ -19,6 +19,10 @@ module Test.Sandwich.WebDriver.Types (
   , WebDriverMonad
   , WebDriverSessionMonad
 
+  -- * On demand options
+  , OnDemandOptions
+  , defaultOnDemandOptions
+
   -- * The Xvfb session
   , XvfbSession(..)
   , getXvfbSession

diff --git a/stack-9.4.8.yaml b/stack-9.4.8.yaml
@@ -35,7 +35,7 @@ extra-deps:
 ## For sandwich-contexts
 
 - git: https://github.com/codedownio/minio-hs
-  commit: 768665c90321d118fdd3cde2c6ac6c01310d76a0
+  commit: 1e63a0ec44fff374799b25a0a02c041eab664c4f
 
 ## For sandwich-contexts-docker
 

diff --git a/stack-9.4.8.yaml.lock b/stack-9.4.8.yaml.lock
@@ -82,15 +82,15 @@ packages:
   original:
     hackage: tls-2.0.1@sha256:6f93816f1b67efafe63a91296e047d6218ccdfd355cd17cd47c798871c871444,6046
 - completed:
-    commit: 768665c90321d118fdd3cde2c6ac6c01310d76a0
+    commit: 1e63a0ec44fff374799b25a0a02c041eab664c4f
     git: https://github.com/codedownio/minio-hs
     name: minio-hs
     pantry-tree:
-      sha256: 63fecbf5146f8704eba62c12ba86494f7bc477d8d882e74846ea0d1dfce03a1a
+      sha256: 6487e6cdf336fda12f9f4e88fb8edc17b3fd32e3f837b5a143237c3d80498929
       size: 4744
     version: 1.7.0
   original:
-    commit: 768665c90321d118fdd3cde2c6ac6c01310d76a0
+    commit: 1e63a0ec44fff374799b25a0a02c041eab664c4f
     git: https://github.com/codedownio/minio-hs
 - completed:
     commit: 8cf2e348999c6f8cf2bb2583b4f5f083fba5170c

diff --git a/stack-9.6.5.yaml b/stack-9.6.5.yaml
diff --git a/stack-9.6.5.yaml.lock b/stack-9.6.5.yaml.lock
diff --git a/stack-9.8.1.yaml b/stack-9.8.1.yaml
@@ -22,7 +22,7 @@ extra-deps:
 ## For sandwich-contexts
 
 - git: https://github.com/codedownio/minio-hs
-  commit: 768665c90321d118fdd3cde2c6ac6c01310d76a0
+  commit: 1e63a0ec44fff374799b25a0a02c041eab664c4f
 
 ## For sandwich-contexts-docker
 

diff --git a/stack.yaml b/stack.yaml
@@ -67,7 +67,7 @@ extra-deps:
 ## For sandwich-contexts
 
 - git: https://github.com/codedownio/minio-hs
-  commit: 768665c90321d118fdd3cde2c6ac6c01310d76a0
+  commit: 1e63a0ec44fff374799b25a0a02c041eab664c4f
 
 ## 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: 768665c90321d118fdd3cde2c6ac6c01310d76a0
+    commit: 1e63a0ec44fff374799b25a0a02c041eab664c4f
     git: https://github.com/codedownio/minio-hs
     name: minio-hs
     pantry-tree:
-      sha256: 63fecbf5146f8704eba62c12ba86494f7bc477d8d882e74846ea0d1dfce03a1a
+      sha256: 6487e6cdf336fda12f9f4e88fb8edc17b3fd32e3f837b5a143237c3d80498929
       size: 4744
     version: 1.7.0
   original:
-    commit: 768665c90321d118fdd3cde2c6ac6c01310d76a0
+    commit: 1e63a0ec44fff374799b25a0a02c041eab664c4f
     git: https://github.com/codedownio/minio-hs
 - completed:
     commit: 8cf2e348999c6f8cf2bb2583b4f5f083fba5170c