Skip to content

Commit 3c53640

Browse files
authored
Merge pull request #1277 from IntersectMBO/newhoggy/upgrade-to-hedgehog-extras-0.10.0.0
deps(test): upgrade hedgehog-extras to 0.10.0.0
2 parents 07a2859 + 080ac73 commit 3c53640

6 files changed

Lines changed: 150 additions & 212 deletions

File tree

.github/workflows/check-pr-changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
- name: Fail if PR changelog is not correct
2222
if: ${{ github.event_name != 'merge_group' }}
23-
uses: actions/github-script@v6
23+
uses: actions/github-script@v7
2424
id: check-changelog
2525
with:
2626
github-token: ${{ secrets.GITHUB_TOKEN }}

cabal.project

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repository cardano-haskell-packages
1313
-- See CONTRIBUTING for information about these, including some Nix commands
1414
-- you need to run if you change them
1515
index-state:
16-
, hackage.haskell.org 2025-06-22T20:18:27Z
16+
, hackage.haskell.org 2025-09-10T10:05:13Z
1717
, cardano-haskell-packages 2025-09-15T19:20:34Z
1818

1919
packages:
@@ -35,6 +35,8 @@ extra-packages: Cabal
3535
if os(windows)
3636
constraints: time ^>=1.14
3737
allow-newer: *:time
38+
-- Needed for running tests with WINE (see https://github.com/haskell/network/issues/604)
39+
constraints: network <3.2.8.0
3840

3941
-- Depending on C++ for just so slightly faster utf8 parsing is a bit annoying
4042
-- especially as it brings in all kinds of complications for GHC.
@@ -64,4 +66,3 @@ if impl (ghc >= 9.12)
6466
allow-newer:
6567
-- https://github.com/kapralVV/Unique/issues/11
6668
, Unique:hashable
67-

cardano-cli/cardano-cli.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ library cardano-cli-test-lib
331331
exceptions,
332332
filepath,
333333
hedgehog,
334-
hedgehog-extras >=0.7.1,
334+
hedgehog-extras ^>=0.10,
335335
http-types,
336336
lifted-base,
337337
mmorph,

cardano-cli/test/cardano-cli-test/Test/Cli/Run/Hash.hs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
{-# LANGUAGE FlexibleContexts #-}
2+
13
{- HLINT ignore "Use camelCase" -}
24

35
module Test.Cli.Run.Hash where
46

57
import Control.Monad (void)
68
import Control.Monad.Catch (MonadCatch)
9+
import Control.Monad.Trans.Control (MonadBaseControl)
710
import Control.Monad.Trans.Resource (MonadResource)
811
import GHC.Stack
912

@@ -24,7 +27,15 @@ hprop_hash_trip =
2427
-- Test that @cardano-cli hash --text > file1@ and
2528
-- @cardano-cli --text --out-file file2@ yields
2629
-- similar @file1@ and @file2@ files.
27-
hash_trip_fun :: (MonadTest m, MonadCatch m, MonadResource m, HasCallStack) => String -> m ()
30+
hash_trip_fun
31+
:: ( MonadBaseControl IO m
32+
, MonadTest m
33+
, MonadCatch m
34+
, MonadResource m
35+
, H.MonadAssertion m
36+
, HasCallStack
37+
)
38+
=> String -> m ()
2839
hash_trip_fun input =
2940
H.moduleWorkspace "tmp" $ \tempDir -> do
3041
hashFile <- noteTempFile tempDir "hash.txt"

0 commit comments

Comments
 (0)