From e682ab51e3ecc74ff194b9a0d0ad6c95a85f3c9d Mon Sep 17 00:00:00 2001 From: Frank Staals Date: Sat, 5 Nov 2022 19:33:40 +0100 Subject: [PATCH 1/7] stop using old hedgehog; current version on hackage already supports 2.18 --- cabal.project | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cabal.project b/cabal.project index cae3dd3..8d0777b 100644 --- a/cabal.project +++ b/cabal.project @@ -1,11 +1,2 @@ write-ghc-environment-files: never packages: . - --- for template-haskell 2.18 support. only matters to the test suite, --- and hackage ignores this file. -source-repository-package - type: git - location: https://github.com/hedgehogqa/haskell-hedgehog - subdir: - hedgehog - tag: 21a5131d6cb2418f8a032759a69003dcb8cfdb30 From 75df5865a466e65f1c796dc35fbb2e1d358d1c50 Mon Sep 17 00:00:00 2001 From: Frank Staals Date: Sat, 5 Nov 2022 19:38:32 +0100 Subject: [PATCH 2/7] build with ghc 9.4 --- vector-circular.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vector-circular.cabal b/vector-circular.cabal index c99c132..8abb425 100644 --- a/vector-circular.cabal +++ b/vector-circular.cabal @@ -32,11 +32,11 @@ library Data.Vector.Circular Data.Vector.Circular.Generic build-depends: - , base >= 4.11 && < 4.17 + , base >= 4.11 && < 4.18 , nonempty-vector >= 0.2 && < 0.3 , primitive >= 0.6.4 && < 0.8 , semigroupoids >= 5.3 && < 5.4 - , template-haskell >= 2.12 && < 2.19 + , template-haskell >= 2.12 && < 2.20 , vector >= 0.12 && < 0.13 , deepseq >= 1.4 && < 1.5 ghc-options: From f795613c4ff1e701f6d494e12cdf555251e4eba2 Mon Sep 17 00:00:00 2001 From: Frank Staals Date: Mon, 27 May 2024 00:07:41 +0200 Subject: [PATCH 3/7] build with ghc 9.10 --- src/Data/Vector/Circular.hs | 2 +- src/Data/Vector/Circular/Generic.hs | 2 +- vector-circular.cabal | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Data/Vector/Circular.hs b/src/Data/Vector/Circular.hs index f7ef6f7..2847f72 100644 --- a/src/Data/Vector/Circular.hs +++ b/src/Data/Vector/Circular.hs @@ -206,7 +206,7 @@ import Prelude hiding (head, length, last, map, concat, takeWhile ,foldl, foldr1, foldl1, all, any, and, or, sum ,product, maximum, minimum, concatMap ,zipWith, zipWith3, zip, zip3, replicate, enumFromTo - ,enumFromThenTo, (++), filter) + ,enumFromThenTo, (++), filter, foldl') import Language.Haskell.TH.Syntax import qualified Data.Foldable as Foldable import qualified Data.Semigroup.Foldable.Class as Foldable1 diff --git a/src/Data/Vector/Circular/Generic.hs b/src/Data/Vector/Circular/Generic.hs index 772663d..3ce2393 100644 --- a/src/Data/Vector/Circular/Generic.hs +++ b/src/Data/Vector/Circular/Generic.hs @@ -202,7 +202,7 @@ import Prelude hiding (head, length, last, map, concat, takeWhile ,foldl, foldr1, foldl1, all, any, and, or, sum ,product, maximum, minimum, concatMap ,zipWith, zipWith3, zip, zip3, replicate, enumFromTo - ,enumFromThenTo, (++), filter) + ,enumFromThenTo, (++), filter, foldl') import Language.Haskell.TH.Syntax import qualified Data.Vector.Mutable as MVector import qualified Data.Vector.NonEmpty as NonEmpty diff --git a/vector-circular.cabal b/vector-circular.cabal index 8abb425..b9a2b54 100644 --- a/vector-circular.cabal +++ b/vector-circular.cabal @@ -32,13 +32,13 @@ library Data.Vector.Circular Data.Vector.Circular.Generic build-depends: - , base >= 4.11 && < 4.18 + , base >= 4.11 && < 4.21 , nonempty-vector >= 0.2 && < 0.3 - , primitive >= 0.6.4 && < 0.8 - , semigroupoids >= 5.3 && < 5.4 - , template-haskell >= 2.12 && < 2.20 - , vector >= 0.12 && < 0.13 - , deepseq >= 1.4 && < 1.5 + , primitive >= 0.6.4 && < 0.10 + , semigroupoids >= 5.3 && < 6.1 + , template-haskell >= 2.12 && < 2.23 + , vector >= 0.12 && < 0.14 + , deepseq >= 1.4 && < 1.6 ghc-options: -Wall -O2 From 98090784e9ed97cf761cf69ad3f32b88dbdd30a2 Mon Sep 17 00:00:00 2001 From: Frank Staals Date: Mon, 27 May 2024 00:13:31 +0200 Subject: [PATCH 4/7] use foldable1-classes-compat --- src/Data/Vector/Circular.hs | 4 ++-- vector-circular.cabal | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Data/Vector/Circular.hs b/src/Data/Vector/Circular.hs index 2847f72..1f1351b 100644 --- a/src/Data/Vector/Circular.hs +++ b/src/Data/Vector/Circular.hs @@ -192,7 +192,7 @@ import Control.DeepSeq #endif /* MIN_VERSION_base(4,13,0) */ import Data.List.NonEmpty (NonEmpty((:|))) import Data.Primitive.MutVar ( newMutVar, readMutVar, writeMutVar ) -import Data.Semigroup.Foldable.Class (Foldable1) +import Data.Foldable1 (Foldable1) import Data.Monoid (All(..)) import Data.Vector (Vector) import Data.Vector.NonEmpty (NonEmptyVector) @@ -209,7 +209,7 @@ import Prelude hiding (head, length, last, map, concat, takeWhile ,enumFromThenTo, (++), filter, foldl') import Language.Haskell.TH.Syntax import qualified Data.Foldable as Foldable -import qualified Data.Semigroup.Foldable.Class as Foldable1 +import qualified Data.Foldable1 as Foldable1 import qualified Data.Vector as Vector import qualified Data.Vector.Mutable as MVector import qualified Data.Vector.NonEmpty as NonEmpty diff --git a/vector-circular.cabal b/vector-circular.cabal index b9a2b54..9c3fcfd 100644 --- a/vector-circular.cabal +++ b/vector-circular.cabal @@ -39,6 +39,7 @@ library , template-haskell >= 2.12 && < 2.23 , vector >= 0.12 && < 0.14 , deepseq >= 1.4 && < 1.6 + , foldable1-classes-compat >= 0.1 && < 0.2 ghc-options: -Wall -O2 From 59bebdb62fcf434fcb5960ff6625b0485a5e5cae Mon Sep 17 00:00:00 2001 From: Frank Staals Date: Mon, 27 May 2024 00:18:28 +0200 Subject: [PATCH 5/7] remove dependency on semigroupsoids, since that is provided by foldable1-classes-compat --- vector-circular.cabal | 1 - 1 file changed, 1 deletion(-) diff --git a/vector-circular.cabal b/vector-circular.cabal index 9c3fcfd..c9b7c99 100644 --- a/vector-circular.cabal +++ b/vector-circular.cabal @@ -35,7 +35,6 @@ library , base >= 4.11 && < 4.21 , nonempty-vector >= 0.2 && < 0.3 , primitive >= 0.6.4 && < 0.10 - , semigroupoids >= 5.3 && < 6.1 , template-haskell >= 2.12 && < 2.23 , vector >= 0.12 && < 0.14 , deepseq >= 1.4 && < 1.6 From 716640e4018171e769c5f05d32198426c519c403 Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Mon, 9 Sep 2024 07:36:41 -0600 Subject: [PATCH 6/7] Update ci.yml for newer actions, GHCs --- .github/workflows/ci.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a0e7d0..826b440 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,19 +13,21 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - cabal: ["3.6"] + cabal: ["3.12"] ghc: - - "8.6.5" - - "8.8.4" - "8.10.7" - "9.0.2" - - "9.2.1" + - "9.2.8" + - "9.4.8" + - "9.6.6" + - "9.8.2" + - "9.10.1" steps: - - uses: actions/checkout@v2.3.5 + - uses: actions/checkout@v4 if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' - - uses: haskell/actions/setup@v1 + - uses: haskell-actions/setup@v2 id: setup-haskell-cabal with: ghc-version: ${{ matrix.ghc }} @@ -35,7 +37,7 @@ jobs: run: | cabal freeze - - uses: actions/cache@v1 + - uses: actions/cache@v4 name: Cache ~/.cabal/store with: path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }} From dbc1f8539311c2ba809065061110fbabe58df5c1 Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Mon, 9 Sep 2024 09:38:22 -0600 Subject: [PATCH 7/7] Exclude MacOS with non-native backend (e.g. LLVM) --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 826b440..d833130 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,13 @@ jobs: - "9.6.6" - "9.8.2" - "9.10.1" + exclude: + # Make sure we only use GHCs with the native backend + # announced in haskell.org/ghc/blog/20211029-ghc-9.2.1-released.html + - os: macos-latest + ghc: "8.10.7" + - os: macos-latest + ghc: "9.0.2" steps: - uses: actions/checkout@v4