From 3ddfa57604804a7f6cb8026f8da74a80850320af Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Sat, 5 Apr 2025 17:23:17 +0200 Subject: [PATCH 1/3] Support GHC 9.12 --- .github/workflows/ci.yml | 2 +- cabal.project | 3 +++ swagger2.cabal | 13 +++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56cb623..3b43f69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.5", "9.8.2", "9.10.1"] + ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.1", "9.10.1", "9.12.1"] cabal: ["3.12.1.0"] os: [ubuntu-latest, macOS-latest] fail-fast: false diff --git a/cabal.project b/cabal.project index b0a523c..6a4f332 100644 --- a/cabal.project +++ b/cabal.project @@ -1,2 +1,5 @@ packages: . tests: true + +allow-newer: insert-ordered-containers:base +allow-newer: insert-ordered-containers:hashable diff --git a/swagger2.cabal b/swagger2.cabal index a9b2265..34566e6 100644 --- a/swagger2.cabal +++ b/swagger2.cabal @@ -30,11 +30,12 @@ tested-with: || ==9.2.8 || ==9.6.4 || ==9.8.1 + || ==9.12.1 custom-setup setup-depends: - base < 4.21 - , Cabal < 3.13 + base < 4.22 + , Cabal < 3.15 , cabal-doctest >=1.0.6 && <1.1 library @@ -62,11 +63,11 @@ library -- GHC boot libraries build-depends: - base >=4.9 && <4.21 + base >=4.9 && <4.22 , bytestring >=0.10.8.1 && <0.13 - , containers >=0.5.7.1 && <0.8 - , template-haskell >=2.11.1.0 && <2.23 - , time >=1.6.0.1 && <1.14 + , containers >=0.5.7.1 && <0.9 + , template-haskell >=2.11.1.0 && <2.24 + , time >=1.6.0.1 && <1.15 , transformers >=0.5.2.0 && <0.7 build-depends: From 044f9297de76156ea4f4d888cc31768c987f0793 Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Tue, 15 Apr 2025 21:37:22 +0200 Subject: [PATCH 2/3] ci: Bump cabal version in CI config --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b43f69..19c285c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.1", "9.10.1", "9.12.1"] - cabal: ["3.12.1.0"] + cabal: ["3.14.1.0"] os: [ubuntu-latest, macOS-latest] fail-fast: false name: build and test (cabal) From 5ec0761ceb468fd81669b5eff7ebb9970439aa62 Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Sun, 11 May 2025 20:23:57 +0200 Subject: [PATCH 3/3] chore: drop GHC 9.12 on CI, remove allow-newer from project file --- .github/workflows/ci.yml | 4 ++-- cabal.project | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19c285c..882a341 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.1", "9.10.1", "9.12.1"] - cabal: ["3.14.1.0"] + ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.1", "9.10.1"] + cabal: ["3.12.1.0"] os: [ubuntu-latest, macOS-latest] fail-fast: false name: build and test (cabal) diff --git a/cabal.project b/cabal.project index 6a4f332..b0a523c 100644 --- a/cabal.project +++ b/cabal.project @@ -1,5 +1,2 @@ packages: . tests: true - -allow-newer: insert-ordered-containers:base -allow-newer: insert-ordered-containers:hashable