From d6fcdaa7ad019c63c5599da385929901701e4b7c Mon Sep 17 00:00:00 2001 From: Alexey Khudyakov Date: Sat, 19 Oct 2024 19:35:58 +0300 Subject: [PATCH 1/2] Relax upper bounds on base to support GHC 9.12 Tested locally with GHC9.12-alpha1 --- vector-stream/vector-stream.cabal | 2 +- vector/vector.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vector-stream/vector-stream.cabal b/vector-stream/vector-stream.cabal index 934f242b..4660d681 100644 --- a/vector-stream/vector-stream.cabal +++ b/vector-stream/vector-stream.cabal @@ -49,7 +49,7 @@ Library Hs-Source-Dirs: src - Build-Depends: base >= 4.9 && < 4.21 + Build-Depends: base >= 4.9 && < 4.22 , ghc-prim >= 0.2 && < 0.12 source-repository head diff --git a/vector/vector.cabal b/vector/vector.cabal index ee8f1071..4f1e43dd 100644 --- a/vector/vector.cabal +++ b/vector/vector.cabal @@ -160,7 +160,7 @@ Library Install-Includes: vector.h - Build-Depends: base >= 4.9 && < 4.21 + Build-Depends: base >= 4.9 && < 4.22 , primitive >= 0.6.4.0 && < 0.10 , deepseq >= 1.1 && < 1.6 , vector-stream >= 0.1 && < 0.2 From b74c33521c9a2c2180a7b1a68fe0d3bc59db2c13 Mon Sep 17 00:00:00 2001 From: Alexey Khudyakov Date: Sat, 19 Oct 2024 22:43:21 +0300 Subject: [PATCH 2/2] Update CI - Add GHC-9.10 - Update cabal to 3.12 (hopefully it will work) - Update GHC-9.6.5 -> 9.6.6 --- .github/workflows/ci.yml | 46 +++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f8419ee..992e272b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,21 +18,22 @@ jobs: matrix: include: # Linux - - { cabal: "3.10", os: ubuntu-22.04, ghc: "8.0.2" } - - { cabal: "3.10", os: ubuntu-22.04, ghc: "8.2.2" } - - { cabal: "3.10", os: ubuntu-22.04, ghc: "8.4.4" } - - { cabal: "3.10", os: ubuntu-22.04, ghc: "8.6.5" } - - { cabal: "3.10", os: ubuntu-22.04, ghc: "8.8.4" } - - { cabal: "3.10", os: ubuntu-22.04, ghc: "8.10.7" } - - { cabal: "3.10", os: ubuntu-22.04, ghc: "9.0.2" } - - { cabal: "3.10", os: ubuntu-22.04, ghc: "9.2.8" } - - { cabal: "3.10", os: ubuntu-22.04, ghc: "9.4.8" } - - { cabal: "3.10", os: ubuntu-22.04, ghc: "9.6.5" } - - { cabal: "3.10", os: ubuntu-22.04, ghc: "9.6.5", + - { cabal: "3.12", os: ubuntu-22.04, ghc: "8.0.2" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "8.2.2" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "8.4.4" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "8.6.5" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "8.8.4" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "8.10.7" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "9.0.2" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "9.2.8" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "9.4.8" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "9.6.6" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "9.6.6", flags: "-fUnsafeChecks -fInternalChecks" } - - { cabal: "3.10", os: ubuntu-22.04, ghc: "9.8.2" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "9.8.2" } + - { cabal: "3.12", os: ubuntu-22.04, ghc: "9.10.1" } # Win - - { cabal: "3.10", os: windows-latest, ghc: "8.4.4" } + - { cabal: "3.12", os: windows-latest, ghc: "8.4.4" } # OOM when building tests # - { cabal: "3.6", os: windows-latest, ghc: "8.6.5" } # - { cabal: "3.6", os: windows-latest, ghc: "8.8.4" } @@ -40,15 +41,16 @@ jobs: # Too flaky: # - { cabal: "3.6", os: windows-latest, ghc: "9.0.1" } # MacOS - - { cabal: "3.10", os: macOS-13, ghc: "8.4.4" } - - { cabal: "3.10", os: macOS-13, ghc: "8.6.5" } - - { cabal: "3.10", os: macOS-13, ghc: "8.8.4" } - - { cabal: "3.10", os: macOS-13, ghc: "8.10.7" } - - { cabal: "3.10", os: macOS-13, ghc: "9.0.2" } - - { cabal: "3.10", os: macOS-latest, ghc: "9.2.8" } - - { cabal: "3.10", os: macOS-latest, ghc: "9.4.8" } - - { cabal: "3.10", os: macOS-latest, ghc: "9.6.5" } - - { cabal: "3.10", os: macOS-latest, ghc: "9.8.2" } + - { cabal: "3.12", os: macOS-13, ghc: "8.4.4" } + - { cabal: "3.12", os: macOS-13, ghc: "8.6.5" } + - { cabal: "3.12", os: macOS-13, ghc: "8.8.4" } + - { cabal: "3.12", os: macOS-13, ghc: "8.10.7" } + - { cabal: "3.12", os: macOS-13, ghc: "9.0.2" } + - { cabal: "3.12", os: macOS-latest, ghc: "9.2.8" } + - { cabal: "3.12", os: macOS-latest, ghc: "9.4.8" } + - { cabal: "3.12", os: macOS-latest, ghc: "9.6.6" } + - { cabal: "3.12", os: macOS-latest, ghc: "9.8.2" } + - { cabal: "3.12", os: macOS-latest, ghc: "9.10.1" } fail-fast: false steps: