Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into emmanuel/add-verifiers
Browse files Browse the repository at this point in the history
  • Loading branch information
giantimi committed May 6, 2024
2 parents fe24af8 + 8cefb14 commit 72881cc
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 526 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['9.2.8']
ghc: ['9.6.3']
cabal: ['3.10']
os: ['ubuntu-20.04', 'ubuntu-22.04', 'macOS-latest']

Expand Down Expand Up @@ -41,6 +41,15 @@ jobs:
dist-newstyle
key: ${{ matrix.os }}-${{ matrix.ghc }}-4-cabal

# System dependencies
- name: Install liblzma
run: brew install xz # xz package contains liblzma
if: startsWith(matrix.os, 'macOS')

- name: Install postgresql
run: brew install postgresql # needed by libpq
if: startsWith(matrix.os, 'macOS')

# Build
- name: Update package database
run: cabal update
Expand Down
43 changes: 6 additions & 37 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,56 +1,25 @@
packages: haskell-src/chainweb-data.cabal
with-compiler: ghc-9.2.8

package aeson
flags: +cffi

package rocksdb-haskell-kadena
ghc-options: -Wwarn -optc-w -optcxx-w

source-repository-package
type: git
location: https://github.com/kadena-io/pact.git
tag: e5c922664fb4df53e3b8e2c48618d71b3ef612ad
--sha256: sha256-t1p+Zd5I/mW2Aggi4xMRl0wj6k3ztsgzydvNkBachFA=
with-compiler: ghc-9.6.3
index-state: 2024-02-01T00:00:00Z

source-repository-package
type: git
location: https://github.com/kadena-io/chainweb-api.git
tag: fc84dcef8197bcfb5415c855421bb1921a749c9f
--sha256: sha256-2qpkAlpJ9qtfsD1WHuW5IYXWHoVXBxRYs5Pd9GOOXz8=

source-repository-package
type: git
location: https://github.com/kadena-io/pact-json
tag: e43073d0b8d89d9b300980913b842f4be339846d
--sha256: sha256-ZWbAId0JBaxDsYhwcYUyw04sjYstXyosSCenzOvUxsQ=

source-repository-package
type: git
location: https://github.com/kadena-io/thyme.git
tag: 6ee9fcb026ebdb49b810802a981d166680d867c9
--sha256: sha256-DqGIoPGBg8py044Xa7l/Y09K+cKGFwlxONHoZRJyzCU=

package vault
documentation: false

write-ghc-environment-files: never

package pact
ghc-options: -Wwarn
optimization: True
flags: -build-tool

constraints: sbv <10
constraints: http2 <4.2
constraints: configuration-tools >= 0.7.0

allow-newer: beam-migrate:pqueue
allow-newer: beam-migrate:aeson
allow-newer: beam-core:aeson
allow-newer: streaming-events:*
allow-newer: postgresql-simple-migration:*
allow-newer: beam-postgres:*
-- allow-newer: *:aeson
allow-newer: *:vector

allow-older: pact:base
allow-older: pact:mtl
allow-older: pact:text
allow-older: pact-json:text
Loading

0 comments on commit 72881cc

Please sign in to comment.