From 85061d9d9e92d3eb9ad39d2e9bc03cf67b37391f Mon Sep 17 00:00:00 2001 From: Jason Shipman Date: Thu, 21 Sep 2023 17:56:29 -0400 Subject: [PATCH] Bump resolvers; link with -threaded option (#4) * Bump resolvers; update CI * Fix #3: Link with -threaded option in test suites --- .github/workflows/ci.yaml | 15 +++++++-------- context-http-client/context-http-client.cabal | 4 ++-- context-http-client/package.yaml | 3 +++ context-resource/context-resource.cabal | 4 ++-- context-resource/package.yaml | 3 +++ .../context-wai-middleware.cabal | 4 ++-- context-wai-middleware/package.yaml | 3 +++ context/context.cabal | 4 ++-- context/package.yaml | 1 + stack-lts-12.yaml | 6 ------ stack-lts-14.yaml | 6 ------ stack-lts-16.yaml | 6 ------ stack-lts-18.yaml | 6 ------ stack-lts-19.yaml | 6 ------ stack-lts-20.yaml | 6 ------ stack-nightly.yaml | 6 ------ stack.yaml | 7 ++++++- stack.yaml.lock | 8 ++++---- stack/stack-lts-12.yaml | 6 ++++++ .../stack-lts-12.yaml.lock | 0 stack/stack-lts-14.yaml | 6 ++++++ .../stack-lts-14.yaml.lock | 0 stack/stack-lts-16.yaml | 6 ++++++ .../stack-lts-16.yaml.lock | 0 stack/stack-lts-18.yaml | 6 ++++++ .../stack-lts-18.yaml.lock | 0 stack/stack-lts-19.yaml | 6 ++++++ .../stack-lts-19.yaml.lock | 0 stack/stack-lts-20.yaml | 6 ++++++ .../stack-lts-20.yaml.lock | 8 ++++---- stack/stack-lts-21.yaml | 6 ++++++ stack/stack-lts-21.yaml.lock | 12 ++++++++++++ stack/stack-nightly.yaml | 6 ++++++ .../stack-nightly.yaml.lock | 8 ++++---- 34 files changed, 103 insertions(+), 71 deletions(-) delete mode 100644 stack-lts-12.yaml delete mode 100644 stack-lts-14.yaml delete mode 100644 stack-lts-16.yaml delete mode 100644 stack-lts-18.yaml delete mode 100644 stack-lts-19.yaml delete mode 100644 stack-lts-20.yaml delete mode 100644 stack-nightly.yaml mode change 120000 => 100644 stack.yaml create mode 100644 stack/stack-lts-12.yaml rename stack-lts-12.yaml.lock => stack/stack-lts-12.yaml.lock (100%) create mode 100644 stack/stack-lts-14.yaml rename stack-lts-14.yaml.lock => stack/stack-lts-14.yaml.lock (100%) create mode 100644 stack/stack-lts-16.yaml rename stack-lts-16.yaml.lock => stack/stack-lts-16.yaml.lock (100%) create mode 100644 stack/stack-lts-18.yaml rename stack-lts-18.yaml.lock => stack/stack-lts-18.yaml.lock (100%) create mode 100644 stack/stack-lts-19.yaml rename stack-lts-19.yaml.lock => stack/stack-lts-19.yaml.lock (100%) create mode 100644 stack/stack-lts-20.yaml rename stack-lts-20.yaml.lock => stack/stack-lts-20.yaml.lock (65%) create mode 100644 stack/stack-lts-21.yaml create mode 100644 stack/stack-lts-21.yaml.lock create mode 100644 stack/stack-nightly.yaml rename stack-nightly.yaml.lock => stack/stack-nightly.yaml.lock (63%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cd9f430..3974755 100644 --- 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 index ed963ab..991b50b 100644 --- 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 index 77f92d7..69c3062 100644 --- 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 index 2f4d8e7..9cb422e 100644 --- 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 index 89aa1aa..6907aa0 100644 --- 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 index 225711b..c9420d1 100644 --- 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 index a6e4bd0..d42cdfa 100644 --- 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 index 0ada03a..42f536e 100644 --- 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 index e82f65b..7204f6e 100644 --- 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 deleted file mode 100644 index f02af58..0000000 --- a/stack-lts-12.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: lts-12.26 -packages: -- ./context -- ./context-http-client -- ./context-resource -- ./context-wai-middleware diff --git a/stack-lts-14.yaml b/stack-lts-14.yaml deleted file mode 100644 index 39f3b63..0000000 --- a/stack-lts-14.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: lts-14.27 -packages: -- ./context -- ./context-http-client -- ./context-resource -- ./context-wai-middleware diff --git a/stack-lts-16.yaml b/stack-lts-16.yaml deleted file mode 100644 index f860079..0000000 --- a/stack-lts-16.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: lts-16.31 -packages: -- ./context -- ./context-http-client -- ./context-resource -- ./context-wai-middleware diff --git a/stack-lts-18.yaml b/stack-lts-18.yaml deleted file mode 100644 index 73dc825..0000000 --- a/stack-lts-18.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: lts-18.28 -packages: -- ./context -- ./context-http-client -- ./context-resource -- ./context-wai-middleware diff --git a/stack-lts-19.yaml b/stack-lts-19.yaml deleted file mode 100644 index afe5f41..0000000 --- a/stack-lts-19.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: lts-19.33 -packages: -- ./context -- ./context-http-client -- ./context-resource -- ./context-wai-middleware diff --git a/stack-lts-20.yaml b/stack-lts-20.yaml deleted file mode 100644 index 0e35200..0000000 --- a/stack-lts-20.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: lts-20.18 -packages: -- ./context -- ./context-http-client -- ./context-resource -- ./context-wai-middleware diff --git a/stack-nightly.yaml b/stack-nightly.yaml deleted file mode 100644 index a3ac194..0000000 --- a/stack-nightly.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: nightly-2023-04-25 -packages: -- ./context -- ./context-http-client -- ./context-resource -- ./context-wai-middleware diff --git a/stack.yaml b/stack.yaml deleted file mode 120000 index ba3b788..0000000 --- a/stack.yaml +++ /dev/null @@ -1 +0,0 @@ -./stack-nightly.yaml \ No newline at end of file diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 0000000..23620f5 --- /dev/null +++ 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 index 3bdc0cc..8a2edda 100644 --- 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 new file mode 100644 index 0000000..69bcc08 --- /dev/null +++ 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 b/stack/stack-lts-12.yaml.lock similarity index 100% rename from stack-lts-12.yaml.lock rename to stack/stack-lts-12.yaml.lock diff --git a/stack/stack-lts-14.yaml b/stack/stack-lts-14.yaml new file mode 100644 index 0000000..18f0fe7 --- /dev/null +++ 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 b/stack/stack-lts-14.yaml.lock similarity index 100% rename from stack-lts-14.yaml.lock rename to stack/stack-lts-14.yaml.lock diff --git a/stack/stack-lts-16.yaml b/stack/stack-lts-16.yaml new file mode 100644 index 0000000..3301d1f --- /dev/null +++ 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 b/stack/stack-lts-16.yaml.lock similarity index 100% rename from stack-lts-16.yaml.lock rename to stack/stack-lts-16.yaml.lock diff --git a/stack/stack-lts-18.yaml b/stack/stack-lts-18.yaml new file mode 100644 index 0000000..d9e136d --- /dev/null +++ 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 b/stack/stack-lts-18.yaml.lock similarity index 100% rename from stack-lts-18.yaml.lock rename to stack/stack-lts-18.yaml.lock diff --git a/stack/stack-lts-19.yaml b/stack/stack-lts-19.yaml new file mode 100644 index 0000000..2ba993e --- /dev/null +++ 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 b/stack/stack-lts-19.yaml.lock similarity index 100% rename from stack-lts-19.yaml.lock rename to stack/stack-lts-19.yaml.lock diff --git a/stack/stack-lts-20.yaml b/stack/stack-lts-20.yaml new file mode 100644 index 0000000..e87eba6 --- /dev/null +++ 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 b/stack/stack-lts-20.yaml.lock similarity index 65% rename from stack-lts-20.yaml.lock rename to stack/stack-lts-20.yaml.lock index d4302c7..ea5a850 100644 --- a/stack-lts-20.yaml.lock +++ b/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 new file mode 100644 index 0000000..ef5dc90 --- /dev/null +++ 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 new file mode 100644 index 0000000..783c01f --- /dev/null +++ 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 new file mode 100644 index 0000000..e372ee7 --- /dev/null +++ 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 b/stack/stack-nightly.yaml.lock similarity index 63% rename from stack-nightly.yaml.lock rename to stack/stack-nightly.yaml.lock index 3bdc0cc..8a2edda 100644 --- a/stack-nightly.yaml.lock +++ b/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