Skip to content

Commit

Permalink
Pact 4.7 (#23)
Browse files Browse the repository at this point in the history
* Build with pact 4.7
* CI with GHC 9
  • Loading branch information
mightybyte authored May 12, 2023
1 parent 09f78c4 commit 4149afa
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 12 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['8.8.4', '8.10.7'] # '9.0.2' broken
ghc: ['8.8.4', '8.10.7', '9.0.2']
cabal: ['3.8']
os: ['ubuntu-20.04', 'ubuntu-22.04', 'macOS-latest']

Expand All @@ -34,8 +34,6 @@ jobs:
if: matrix.ghc == '9.0.2' || matrix.ghc == '8.10.7'
run: |
cat > cabal.project.local <<EOF
allow-newer: chainweb-api:*
allow-newer: kadena-signing-api:*
allow-newer: *:base
EOF
Expand Down
19 changes: 15 additions & 4 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ package pact
source-repository-package
type: git
location: https://github.com/mightybyte/HsYAML.git
tag: 5a93c4c23d70006f73449b2c158007262c1da33f
tag: 2ad3cbd1c84f8ab362cf1f5fd4bb3e869dfcc102

source-repository-package
type: git
location: https://github.com/mightybyte/HsYAML-aeson.git
tag: 1f2e9a8d0e0ee3d0ad356dcea5c50af4eb27becc
tag: 077110e5e52dc91d593c546dd1baaafd3066558d

source-repository-package
type: git
Expand All @@ -23,7 +23,7 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/kadena-io/chainweb-api.git
tag: c877d32b46175917d9df9521d0c4e7ec47ebd5cd
tag: b3e28d62c622ebda0d84e136ea6c995d5f97e46f

source-repository-package
type: git
Expand All @@ -33,10 +33,21 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/kadena-io/pact.git
tag: 842fbc4256b3cbbde337dbeaa393b649a26f1574
tag: 83c5944991d6edcd34d79f9fbf8e537d060689c6

source-repository-package
type: git
location: https://github.com/kadena-io/signing-api.git
tag: b60553cc61fa15c26763ca59974e0de3512b2d66
subdir: kadena-signing-api

allow-newer: hashable:base
allow-newer: chainweb-api:aeson

-- bounds from pact
constraints: aeson <2
constraints: base16-bytestring <1
constraints: base64-bytestring <1.1
constraints: hashable <1.3.1
constraints: prettyprinter <1.6.1
constraints: unordered-containers <0.2.16
4 changes: 2 additions & 2 deletions deps/chainweb-api/github.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"repo": "chainweb-api",
"branch": "master",
"private": false,
"rev": "c877d32b46175917d9df9521d0c4e7ec47ebd5cd",
"sha256": "04400lhi7g4j2ac1skzv39hfh6bvnhrli7zqvv9m3skqqm6x19sz"
"rev": "b3e28d62c622ebda0d84e136ea6c995d5f97e46f",
"sha256": "1m9x9n5mwmv97fkv2z3hvlhlj59xm2mpsc816hzriw28pv1jb9zh"
}
4 changes: 2 additions & 2 deletions deps/pact/github.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"repo": "pact",
"branch": "master",
"private": false,
"rev": "842fbc4256b3cbbde337dbeaa393b649a26f1574",
"sha256": "0sg20svw369v5ibxxhnizfqimvxyjla0afbv8023sqcjsgc1hglc"
"rev": "83c5944991d6edcd34d79f9fbf8e537d060689c6",
"sha256": "0l59xi2by6l6gi10r8c437m7ics29215zr0zl1syyr3039vgmv0x"
}
2 changes: 1 addition & 1 deletion kda-tool.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ library
Decimal
, HsYAML
, HsYAML-aeson
, aeson
, aeson < 2
, async
, attoparsec
, base >= 4.13 && < 5
Expand Down

0 comments on commit 4149afa

Please sign in to comment.