From 90aef432c96cb1ef3828e4c52edaf9bda7fda114 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 12 Apr 2024 00:09:47 +0100 Subject: [PATCH 1/4] Build with ghc 9.8 --- .github/workflows/haskell.yml | 2 +- ChangeLog.md | 4 ++++ reflex.cabal | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index dc3c98e9..518b69c9 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -6,7 +6,7 @@ jobs: build: strategy: matrix: - ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.5', '9.4.5', '9.6.1'] + ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.5', '9.4.5', '9.6.1', '9.8.2'] os: ['ubuntu-latest', 'macos-latest'] runs-on: ${{ matrix.os }} diff --git a/ChangeLog.md b/ChangeLog.md index fc98f9c5..41cee5a0 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,9 @@ # Revision history for reflex +## Unreleased + +* Add support for GHC 9.8 + ## 0.9.3.0 * Headless Host: Generalize to allow returning arbitrary types diff --git a/reflex.cabal b/reflex.cabal index 184e9a14..9cbe55bb 100644 --- a/reflex.cabal +++ b/reflex.cabal @@ -28,7 +28,7 @@ extra-source-files: ChangeLog.md tested-with: - GHC ==8.4.4 || ==8.6.5 || ==8.8.1 || ==8.10.7 || ==9.0.1 || ==9.2.5 || ==9.4.5 || ==9.6.1, + GHC ==8.4.4 || ==8.6.5 || ==8.8.1 || ==8.10.7 || ==9.0.1 || ==9.2.5 || ==9.4.5 || ==9.6.1 || ==9.8.2, GHCJS ==8.6 || ==8.10 flag use-reflex-optimizer @@ -71,7 +71,7 @@ library hs-source-dirs: src build-depends: MemoTrie == 0.6.*, - base >= 4.11 && < 4.19, + base >= 4.11 && < 4.20, bifunctors >= 5.2 && < 5.7, comonad >= 5.0.4 && < 5.1, commutative-semigroups >= 0.1 && <0.2, @@ -89,7 +89,7 @@ library mtl >= 2.1 && < 2.4, patch >= 0.0.7 && < 0.1, prim-uniq >= 0.1.0.1 && < 0.3, - primitive >= 0.5 && < 0.8, + primitive >= 0.5 && < 0.9, profunctors >= 5.3 && < 5.7, random >= 1.1 && < 1.3, ref-tf >= 0.4 && < 0.6, @@ -189,7 +189,7 @@ library build-depends: haskell-src-exts >= 1.16 && < 1.24, haskell-src-meta >= 0.6 && < 0.9, - template-haskell >= 2.9 && < 2.21 + template-haskell >= 2.9 && < 2.22 exposed-modules: Reflex.Dynamic.TH other-extensions: TemplateHaskell From 1205bc76e76f7c7600dfb4d2945474b655974ff5 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 26 Sep 2024 16:59:54 -0400 Subject: [PATCH 2/4] Bump patch in `release.nix` --- release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.nix b/release.nix index dac89c9f..7cb4c507 100644 --- a/release.nix +++ b/release.nix @@ -66,8 +66,8 @@ let patch = self.callHackageDirect { pkg = "patch"; - ver = "0.0.8.2"; - sha256 = "160zqqhjg48fr3a33gffd82qm3728c8hwf8sn37pbpv82fw71rzg"; + ver = "0.0.8.3"; + sha256 = "054slcrlsdcs6azwph6v3vgsgk939ax7ax9xw76whywkrim20n1w"; } {}; }; }; From a2b637fcfaf63ab7cbd37f3cb3af9e9999292167 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 26 Sep 2024 17:25:16 -0400 Subject: [PATCH 3/4] Update cabal --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 518b69c9..c20fe722 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -16,7 +16,7 @@ jobs: - uses: haskell/actions/setup@v2 with: ghc-version: ${{ matrix.ghc }} - cabal-version: '3.10.1.0' + cabal-version: '3.10.3.0' - name: Cache uses: actions/cache@v3 env: From edadd04e265bc9ef9d4f558d95392af5307ee822 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 27 Sep 2024 11:16:31 -0400 Subject: [PATCH 4/4] Need to cabal update after cache unpack Thanks @fgaz! See also https://github.com/haskell-actions/setup?tab=readme-ov-file#model-cabal-workflow-with-caching --- .github/workflows/haskell.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index c20fe722..353bcd96 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -12,11 +12,14 @@ jobs: name: GHC ${{ matrix.ghc }} on ${{ matrix.os }} steps: + - uses: actions/checkout@v3 + - uses: haskell/actions/setup@v2 with: ghc-version: ${{ matrix.ghc }} cabal-version: '3.10.3.0' + - name: Cache uses: actions/cache@v3 env: @@ -31,11 +34,16 @@ jobs: ${{ runner.os }} - name: Install dependencies - run: cabal build --only-dependencies --enable-tests --enable-benchmarks + run: | + cabal update + cabal build --only-dependencies --enable-tests --enable-benchmarks + - name: Build run: cabal build --enable-tests --enable-benchmarks all + - name: Run tests run: cabal test --enable-tests all + - if: matrix.ghc != '8.4.4' # docs aren't built on ghc 8.4.4 because some dependency docs don't build on older GHCs name: Build Docs