From 6b16fa7156a27196882263d712575b1f8e1c6275 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sat, 16 Mar 2024 16:28:04 +0100 Subject: [PATCH] Allow base-4.20 and tasty-1.5; bump CI to GHC 9.8 --- .github/workflows/ci.yml | 8 ++++---- primitive.cabal | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 378945f..495d002 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - ghc: ['8.0', '8.2', '8.4', '8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6'] + ghc: ['8.0', '8.2', '8.4', '8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6', '9.8'] include: - os: windows-latest ghc: 'latest' @@ -26,15 +26,15 @@ jobs: # - os: ubuntu-latest # ghc: 'latest' steps: - - uses: actions/checkout@v3 - - uses: haskell/actions/setup@v2 + - uses: actions/checkout@v4 + - uses: haskell-actions/setup@v2 id: setup-haskell-cabal with: ghc-version: ${{ matrix.ghc }} ghcup-release-channel: ${{ matrix.ghcup-release-channel }} - name: Update cabal package database run: cabal update - - uses: actions/cache@v3 + - uses: actions/cache@v4 name: Cache cabal stuff with: path: | diff --git a/primitive.cabal b/primitive.cabal index 22c9e35..fd160a3 100644 --- a/primitive.cabal +++ b/primitive.cabal @@ -26,8 +26,10 @@ Tested-With: GHC == 8.8.4 GHC == 8.10.7 GHC == 9.0.2 - GHC == 9.2.5 - GHC == 9.4.4 + GHC == 9.2.8 + GHC == 9.4.8 + GHC == 9.6.4 + GHC == 9.8.2 Library Default-Language: Haskell2010 @@ -55,7 +57,7 @@ Library Data.Primitive.Internal.Operations Data.Primitive.Internal.Read - Build-Depends: base >= 4.9 && < 4.20 + Build-Depends: base >= 4.9 && < 4.21 , deepseq >= 1.1 && < 1.6 , transformers >= 0.5 && < 0.7 , template-haskell >= 2.11 @@ -90,7 +92,7 @@ test-suite test-qc , primitive , quickcheck-classes-base >= 0.6 && <0.7 , QuickCheck >= 2.13 && < 2.15 - , tasty ^>= 1.2 || ^>= 1.3 || ^>= 1.4 + , tasty >= 1.2 && < 1.6 , tasty-quickcheck , tagged , transformers >= 0.5