From 5e5dcc901a9326fdc548a745d7261bb1c31eb367 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:10:10 -0400 Subject: [PATCH 01/12] Bump the package version. --- fused-effects-exceptions.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fused-effects-exceptions.cabal b/fused-effects-exceptions.cabal index 2f922c2..596604f 100644 --- a/fused-effects-exceptions.cabal +++ b/fused-effects-exceptions.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: fused-effects-exceptions -version: 1.0.0.0 +version: 1.1.0.0 synopsis: Handle exceptions thrown in IO with fused-effects. description: Provides Resource and Catch effects capable of reacting to and catching GHC's dynamic exceptions. homepage: https://github.com/fused-effects/fused-effects-exceptions#readme From 14bbc5104c202b02574b5496c2b81ab10e62bc0c Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:10:38 -0400 Subject: [PATCH 02/12] Add a changelog entry. --- ChangeLog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 0344e38..1daaeee 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,8 @@ +# 1.1.0.0 + +* Port to fused-effects 1.1. + + # 1.0.0.0 * Port to fused-effects 1.0. From 47ae6df816dd1985a490412ba3cd6a414103f20b Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:10:56 -0400 Subject: [PATCH 03/12] Add 8.10 to tested-with. --- fused-effects-exceptions.cabal | 1 + 1 file changed, 1 insertion(+) diff --git a/fused-effects-exceptions.cabal b/fused-effects-exceptions.cabal index 596604f..7ba94ac 100644 --- a/fused-effects-exceptions.cabal +++ b/fused-effects-exceptions.cabal @@ -21,6 +21,7 @@ tested-with: GHC == 8.4.4 GHC == 8.6.5 GHC == 8.8.1 + GHC == 8.10.1 common common default-language: Haskell2010 From 777a95e643f4ae31526566a4080f9a1f8eba4240 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:11:05 -0400 Subject: [PATCH 04/12] Bump 8.8 to 8.8.3. --- fused-effects-exceptions.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fused-effects-exceptions.cabal b/fused-effects-exceptions.cabal index 7ba94ac..8557930 100644 --- a/fused-effects-exceptions.cabal +++ b/fused-effects-exceptions.cabal @@ -20,7 +20,7 @@ tested-with: GHC == 8.2.2 GHC == 8.4.4 GHC == 8.6.5 - GHC == 8.8.1 + GHC == 8.8.3 GHC == 8.10.1 common common From e5485955e7d2609c3ded7b5211e8be8307185d75 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:11:33 -0400 Subject: [PATCH 05/12] Bump CI to the latest 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 e61f342..0b74723 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: ghc: ["8.2.2", "8.4.4", "8.6.5", "8.8.1"] - cabal: ["3.0"] + cabal: ["latest"] steps: - uses: actions/checkout@master From bfc75060ca58d3d50a32da6f1bee6d3a91e651be Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:11:42 -0400 Subject: [PATCH 06/12] Bump CI to 8.8.3. --- .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 0b74723..c1a7501 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-16.04 strategy: matrix: - ghc: ["8.2.2", "8.4.4", "8.6.5", "8.8.1"] + ghc: ["8.2.2", "8.4.4", "8.6.5", "8.8.3"] cabal: ["latest"] steps: From d0f182f33a9f59f00a4303559a0f15385390f749 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:11:51 -0400 Subject: [PATCH 07/12] Add 8.10 to CI. --- .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 c1a7501..6f0fac6 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-16.04 strategy: matrix: - ghc: ["8.2.2", "8.4.4", "8.6.5", "8.8.3"] + ghc: ["8.2.2", "8.4.4", "8.6.5", "8.8.3", "8.10.1"] cabal: ["latest"] steps: From 63cd204413756af172d06d8a905a0b70b2d7087b Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:12:52 -0400 Subject: [PATCH 08/12] Add a CI-specific cabal.project file. --- cabal.project.ci | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 cabal.project.ci diff --git a/cabal.project.ci b/cabal.project.ci new file mode 100644 index 0000000..f022fab --- /dev/null +++ b/cabal.project.ci @@ -0,0 +1,4 @@ +packages: . + +package fused-effects-exceptions + ghc-options: -Werror From 0fffc0ef74b469c756b4f5d2c2c856a7af8e9651 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:15:11 -0400 Subject: [PATCH 09/12] Update the CI config. --- .github/workflows/haskell.yml | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 6f0fac6..b7ef92d 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -12,25 +12,41 @@ jobs: cabal: ["latest"] steps: - - uses: actions/checkout@master - if: github.event.action == 'opened' || github.event.action == 'synchronize' + - uses: actions/checkout@v2 + if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' - - uses: actions/setup-haskell@v1 + - uses: actions/setup-haskell@v1.1.2 name: Setup Haskell with: ghc-version: ${{ matrix.ghc }} cabal-version: ${{ matrix.cabal }} + - uses: actions/cache@v1 + name: Cache ~/.cabal/packages + with: + path: ~/.cabal/packages + key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-packages + - uses: actions/cache@v1 + name: Cache ~/.cabal/store + with: + path: ~/.cabal/store + key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-store + - uses: actions/cache@v1 + name: Cache dist-newstyle + with: + path: dist-newstyle + key: ${{ runner.os }}-${{ matrix.ghc }}-fused-effects-exceptions-dist + - name: Install dependencies run: | cabal v2-update - cabal v2-configure --enable-tests --write-ghc-environment-files=always -j2 - cabal v2-build --only-dependencies + cabal v2-configure --project-file=cabal.project.ci --enable-tests --write-ghc-environment-files=always -j2 + cabal v2-build --project-file=cabal.project.ci --only-dependencies all - name: Build & test run: | - cabal v2-build - cabal v2-test - cabal v2-haddock - cabal v2-sdist + cabal v2-build --project-file=cabal.project.ci + cabal v2-run --project-file=cabal.project.ci test + cabal v2-haddock --project-file=cabal.project.ci + cabal v2-sdist --project-file=cabal.project.ci cabal check From 657ababae43c41f32086c6eae889dbb0d3667c8b Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:15:25 -0400 Subject: [PATCH 10/12] Rename the CI config. --- .github/workflows/{haskell.yml => ci.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{haskell.yml => ci.yml} (100%) diff --git a/.github/workflows/haskell.yml b/.github/workflows/ci.yml similarity index 100% rename from .github/workflows/haskell.yml rename to .github/workflows/ci.yml From 39ca4b9b155bf02f36bc9ed0666220c6260dd31c Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:15:51 -0400 Subject: [PATCH 11/12] Placate hlint. --- test/Main.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Main.hs b/test/Main.hs index 536e95d..378fd34 100644 --- a/test/Main.hs +++ b/test/Main.hs @@ -19,12 +19,12 @@ problematic = testStateDropsWrites :: Tasty.TestTree testStateDropsWrites = HUnit.testCase "State.Strict drops writes" $ do - result <- State.execState 'a' $ problematic + result <- State.execState 'a' problematic result HUnit.@?= 'a' -- writes are lost testIOStatePreservesWrites :: Tasty.TestTree testIOStatePreservesWrites = HUnit.testCase "State.IORef preserves writes" $ do - result <- IOState.execState 'a' $ problematic + result <- IOState.execState 'a' problematic result HUnit.@?= 'x' tests :: Tasty.TestTree From 917120d62c376c675ead366f3f57b2edfd1d5f0f Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 13 Jul 2020 11:15:57 -0400 Subject: [PATCH 12/12] Spacing. --- test/Main.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Main.hs b/test/Main.hs index 378fd34..3b957cb 100644 --- a/test/Main.hs +++ b/test/Main.hs @@ -37,4 +37,3 @@ tests = Tasty.testGroup "Control.Carrier.Exception" main :: IO () main = Tasty.defaultMain tests -