From 260189ab1a20e1652385f82f4dd69a0c0aa7e291 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Fri, 20 Jun 2025 17:17:49 +0200 Subject: [PATCH 1/4] Include GHC 9.12 in Cabal CI --- .github/workflows/ci.yml | 11 ++++++----- heist.cabal | 7 ++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aab3391..bb3688a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,14 +38,15 @@ jobs: - "9.6" - "9.8" - "9.10" + - "9.12" include: - - { os: macOS-latest, ghc: "9.10" } - - { os: windows-latest, ghc: "9.10" } + - { os: macOS-latest, ghc: "9.12" } + - { os: windows-latest, ghc: "9.12" } steps: - uses: actions/checkout@v4 - - name: Set up GHC ${{ matrix.ghc-version }} + - name: Set up GHC ${{ matrix.ghc }} uses: haskell-actions/setup@v2 id: setup with: @@ -100,7 +101,7 @@ jobs: include: # GHC version must match https://www.stackage.org/nightly - stack: "latest" - ghc: "9.8" + ghc: "9.10" steps: - uses: nikeee/setup-pandoc@v1 @@ -119,7 +120,7 @@ jobs: cat < stack.yaml packages: - '.' - resolver: nightly-2023-07-17 + resolver: nightly-2025-06-18 EOF stack config set system-ghc true --global stack config set resolver nightly diff --git a/heist.cabal b/heist.cabal index 5b3345a..14f8c56 100644 --- a/heist.cabal +++ b/heist.cabal @@ -37,9 +37,10 @@ tested-with: GHC == 9.0.2 GHC == 9.2.8 GHC == 9.4.8 - GHC == 9.6.5 - GHC == 9.8.2 - GHC == 9.10.1 + GHC == 9.6.7 + GHC == 9.8.4 + GHC == 9.10.2 + GHC == 9.12.2 extra-doc-files: CHANGELOG.md From 3475abde0aece4dd7c818a9a8f2e681153d6c1fe Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Fri, 20 Jun 2025 17:19:46 +0200 Subject: [PATCH 2/4] v1.1.1.2 revision 5: Allow QuickCheck <3 --- heist.cabal | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/heist.cabal b/heist.cabal index 14f8c56..70c4c54 100644 --- a/heist.cabal +++ b/heist.cabal @@ -1,6 +1,7 @@ cabal-version: 2.2 name: heist version: 1.1.1.2 +x-revision: 5 synopsis: An Haskell template system supporting both HTML5 and XML. description: Heist is a powerful template system that supports both HTML5 and XML. @@ -200,7 +201,7 @@ Library monad-control >= 0.3 && < 1.1, mtl >= 2.0 && < 2.4, process >= 1.1 && < 1.7, - random >= 1.0.1.0 && < 1.3, + random >= 1.0.1.0 && < 2, text >= 0.10 && < 2.2, time >= 1.1 && < 2, transformers >= 0.3 && < 0.7, @@ -229,7 +230,7 @@ Test-suite testsuite build-depends: HUnit >= 1.2 && < 2, - QuickCheck >= 2 && < 2.16, + QuickCheck >= 2 && < 3, lens >= 4.3 && < 5.4, test-framework >= 0.4 && < 0.9, test-framework-hunit >= 0.2.7 && < 0.4, From ac3c194dd99c0fa65c9c48fb50bff62783520e1e Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Fri, 20 Jun 2025 18:23:59 +0200 Subject: [PATCH 3/4] CI: disable cron job (leads to GitHub disabling the whole action) --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb3688a..c45b079 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,10 @@ on: push: branches: - 'master' - schedule: - # Additionally run once per week (At 00:00 on Sunday) to maintain cache. - - cron: '0 0 * * 0' + # GitHub disables actions after 60 days of inactivity, so a cron job is rather useless. + # schedule: + # # Additionally run once per week (At 00:00 on Sunday) to maintain cache. + # - cron: '0 0 * * 0' jobs: cabal: From 53d64bcc6042325a5d50447c3de48404ac9ff264 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 23 Jul 2025 09:39:33 +0200 Subject: [PATCH 4/4] CI stack: bump ghc version as nightly moved to 9.12 --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c45b079..6e6a816 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,9 +102,10 @@ jobs: include: # GHC version must match https://www.stackage.org/nightly - stack: "latest" - ghc: "9.10" + ghc: "9.12" steps: + # for running tests: - uses: nikeee/setup-pandoc@v1 - uses: actions/checkout@v4 @@ -121,7 +122,7 @@ jobs: cat < stack.yaml packages: - '.' - resolver: nightly-2025-06-18 + resolver: nightly-2025-07-23 EOF stack config set system-ghc true --global stack config set resolver nightly