Bump resolvers; link with -threaded option (#4)

* Bump resolvers; update CI * Fix #3: Link with -threaded option in test suites
jship · Sep 21, 2023 · 85061d9 · 85061d9
1 parent 810fe23
commit 85061d9
Show file tree

Hide file tree

Showing 34 changed files with 103 additions and 71 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,7 +13,9 @@ jobs:
       matrix:
         os: [ubuntu-latest, macOS-latest]
         resolver:
-        - nightly # ghc-9.2.3
+        - nightly # ghc-9.6.2
+        - lts-21  # ghc-9.4.7
+        - lts-20  # ghc-9.2.8
         - lts-19  # ghc-9.0.2
         - lts-18  # ghc-8.10.7
         - lts-16  # ghc-8.8.4
@@ -22,11 +24,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: freckle/stack-cache-action@v2
+    - id: stack
+      uses: freckle/stack-action@v4
       with:
-        prefix: v1/
-        stack-yaml: stack-${{ matrix.resolver }}.yaml
-    - uses: freckle/stack-action@v3
-      with:
-        stack-yaml: stack-${{ matrix.resolver }}.yaml
-        stack-arguments: --bench --no-run-benchmarks --haddock --no-haddock-deps
+        stack-yaml: stack/stack-${{ matrix.resolver }}.yaml
+        stack-arguments: --bench --no-run-benchmarks --haddock
diff --git a/context-http-client/context-http-client.cabal b/context-http-client/context-http-client.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.35.2.
 --
 -- see: https://github.com/sol/hpack
 
@@ -50,7 +50,7 @@ test-suite context-http-client-test-suite
       Paths_context_http_client
   hs-source-dirs:
       test-suite
-  ghc-options: -Wall -fwarn-tabs -Wincomplete-uni-patterns -Wredundant-constraints
+  ghc-options: -Wall -fwarn-tabs -Wincomplete-uni-patterns -Wredundant-constraints -threaded -with-rtsopts=-N
   build-tool-depends:
       hspec-discover:hspec-discover
   build-depends:

diff --git a/context-http-client/package.yaml b/context-http-client/package.yaml
@@ -49,3 +49,6 @@ tests:
     - stm
     - wai
     - warp
+    ghc-options:
+    - -threaded
+    - -with-rtsopts=-N
diff --git a/context-resource/context-resource.cabal b/context-resource/context-resource.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.35.2.
 --
 -- see: https://github.com/sol/hpack
 
@@ -51,7 +51,7 @@ test-suite context-resource-test-suite
       Paths_context_resource
   hs-source-dirs:
       test-suite
-  ghc-options: -Wall -fwarn-tabs -Wincomplete-uni-patterns -Wredundant-constraints
+  ghc-options: -Wall -fwarn-tabs -Wincomplete-uni-patterns -Wredundant-constraints -threaded -with-rtsopts=-N
   build-tool-depends:
       hspec-discover:hspec-discover
   build-depends:

diff --git a/context-resource/package.yaml b/context-resource/package.yaml
@@ -43,3 +43,6 @@ tests:
     - context
     - context-resource
     - hspec
+    ghc-options:
+    - -threaded
+    - -with-rtsopts=-N
diff --git a/context-wai-middleware/context-wai-middleware.cabal b/context-wai-middleware/context-wai-middleware.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.35.2.
 --
 -- see: https://github.com/sol/hpack
 
@@ -50,7 +50,7 @@ test-suite context-wai-middleware-test-suite
       Paths_context_wai_middleware
   hs-source-dirs:
       test-suite
-  ghc-options: -Wall -fwarn-tabs -Wincomplete-uni-patterns -Wredundant-constraints
+  ghc-options: -Wall -fwarn-tabs -Wincomplete-uni-patterns -Wredundant-constraints -threaded -with-rtsopts=-N
   build-tool-depends:
       hspec-discover:hspec-discover
   build-depends:

diff --git a/context-wai-middleware/package.yaml b/context-wai-middleware/package.yaml
@@ -49,3 +49,6 @@ tests:
     - stm
     - wai
     - warp
+    ghc-options:
+    - -threaded
+    - -with-rtsopts=-N
diff --git a/context/context.cabal b/context/context.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.35.2.
 --
 -- see: https://github.com/sol/hpack
 
@@ -58,7 +58,7 @@ test-suite context-test-suite
       Paths_context
   hs-source-dirs:
       test-suite
-  ghc-options: -Wall -fwarn-tabs -Wincomplete-uni-patterns -Wredundant-constraints -threaded
+  ghc-options: -Wall -fwarn-tabs -Wincomplete-uni-patterns -Wredundant-constraints -threaded -with-rtsopts=-N
   build-tool-depends:
       hspec-discover:hspec-discover
   build-depends:

diff --git a/context/package.yaml b/context/package.yaml
@@ -46,3 +46,4 @@ tests:
     - context
     ghc-options:
     - -threaded
+    - -with-rtsopts=-N
diff --git a/stack-lts-12.yaml b/stack-lts-12.yaml
diff --git a/stack-lts-14.yaml b/stack-lts-14.yaml
diff --git a/stack-lts-16.yaml b/stack-lts-16.yaml
diff --git a/stack-lts-18.yaml b/stack-lts-18.yaml
diff --git a/stack-lts-19.yaml b/stack-lts-19.yaml
diff --git a/stack-lts-20.yaml b/stack-lts-20.yaml
diff --git a/stack-nightly.yaml b/stack-nightly.yaml
diff --git a/stack.yaml b/stack.yaml
diff --git a/stack.yaml b/stack.yaml
@@ -0,0 +1,6 @@
+resolver: nightly-2023-09-21
+packages:
+- ./context
+- ./context-http-client
+- ./context-resource
+- ./context-wai-middleware
diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    sha256: c110d42fae0aff8f393c87e2f52e70c50653554c4a6b942e401f464ea4c08a80
-    size: 609034
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/4/25.yaml
-  original: nightly-2023-04-25
+    sha256: df9480bf80555bf35fd58d6fa22b1385301eeb1abcb511d712a98f241f243ba0
+    size: 669116
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/9/21.yaml
+  original: nightly-2023-09-21
diff --git a/stack/stack-lts-12.yaml b/stack/stack-lts-12.yaml
@@ -0,0 +1,6 @@
+resolver: lts-12.26
+packages:
+- ../context
+- ../context-http-client
+- ../context-resource
+- ../context-wai-middleware
diff --git a/stack-lts-12.yaml.lock → stack/stack-lts-12.yaml.lock b/stack-lts-12.yaml.lock → stack/stack-lts-12.yaml.lock
diff --git a/stack/stack-lts-14.yaml b/stack/stack-lts-14.yaml
@@ -0,0 +1,6 @@
+resolver: lts-14.27
+packages:
+- ../context
+- ../context-http-client
+- ../context-resource
+- ../context-wai-middleware
diff --git a/stack-lts-14.yaml.lock → stack/stack-lts-14.yaml.lock b/stack-lts-14.yaml.lock → stack/stack-lts-14.yaml.lock
diff --git a/stack/stack-lts-16.yaml b/stack/stack-lts-16.yaml
@@ -0,0 +1,6 @@
+resolver: lts-16.31
+packages:
+- ../context
+- ../context-http-client
+- ../context-resource
+- ../context-wai-middleware
diff --git a/stack-lts-16.yaml.lock → stack/stack-lts-16.yaml.lock b/stack-lts-16.yaml.lock → stack/stack-lts-16.yaml.lock
diff --git a/stack/stack-lts-18.yaml b/stack/stack-lts-18.yaml
@@ -0,0 +1,6 @@
+resolver: lts-18.28
+packages:
+- ../context
+- ../context-http-client
+- ../context-resource
+- ../context-wai-middleware
diff --git a/stack-lts-18.yaml.lock → stack/stack-lts-18.yaml.lock b/stack-lts-18.yaml.lock → stack/stack-lts-18.yaml.lock
diff --git a/stack/stack-lts-19.yaml b/stack/stack-lts-19.yaml
@@ -0,0 +1,6 @@
+resolver: lts-19.33
+packages:
+- ../context
+- ../context-http-client
+- ../context-resource
+- ../context-wai-middleware
diff --git a/stack-lts-19.yaml.lock → stack/stack-lts-19.yaml.lock b/stack-lts-19.yaml.lock → stack/stack-lts-19.yaml.lock
diff --git a/stack/stack-lts-20.yaml b/stack/stack-lts-20.yaml
@@ -0,0 +1,6 @@
+resolver: lts-20.26
+packages:
+- ../context
+- ../context-http-client
+- ../context-resource
+- ../context-wai-middleware
diff --git a/stack-lts-20.yaml.lock → stack/stack-lts-20.yaml.lock b/stack-lts-20.yaml.lock → stack/stack-lts-20.yaml.lock
@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    sha256: 9fa4bece7acfac1fc7930c5d6e24606004b09e80aa0e52e9f68b148201008db9
-    size: 649606
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/18.yaml
-  original: lts-20.18
+    sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2
+    size: 650475
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml
+  original: lts-20.26
diff --git a/stack/stack-lts-21.yaml b/stack/stack-lts-21.yaml
@@ -0,0 +1,6 @@
+resolver: lts-21.12
+packages:
+- ../context
+- ../context-http-client
+- ../context-resource
+- ../context-wai-middleware
diff --git a/stack/stack-lts-21.yaml.lock b/stack/stack-lts-21.yaml.lock
@@ -0,0 +1,12 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages: []
+snapshots:
+- completed:
+    sha256: 9313df78f49519315342f4c51ffc5da12659d3735f8ac3c54a1fb98ff874474e
+    size: 640036
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/12.yaml
+  original: lts-21.12
diff --git a/stack/stack-nightly.yaml b/stack/stack-nightly.yaml
@@ -0,0 +1,6 @@
+resolver: nightly-2023-09-21
+packages:
+- ../context
+- ../context-http-client
+- ../context-resource
+- ../context-wai-middleware
diff --git a/stack-nightly.yaml.lock → stack/stack-nightly.yaml.lock b/stack-nightly.yaml.lock → stack/stack-nightly.yaml.lock
@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    sha256: c110d42fae0aff8f393c87e2f52e70c50653554c4a6b942e401f464ea4c08a80
-    size: 609034
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/4/25.yaml
-  original: nightly-2023-04-25
+    sha256: df9480bf80555bf35fd58d6fa22b1385301eeb1abcb511d712a98f241f243ba0
+    size: 669116
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/9/21.yaml
+  original: nightly-2023-09-21