Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the cabal build #2748

Merged
merged 3 commits into from
Jul 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .buildkite/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ steps:
agents:
system: x86_64-linux
queue: benchmark
if: 'build.env("step") == null || build.env("step") =~ /restore-mainnet/'

# Temporary disabled due to timing out (#2221)
# - label: 'Restore benchmark - cardano testnet'
Expand All @@ -21,20 +22,23 @@ steps:
# agents:
# system: x86_64-linux
# queue: benchmark
# if: 'build.env("step") == null || build.env("step") =~ /restore-testnet/'

- label: 'Database benchmark'
command: "./.buildkite/bench-db.sh"
timeout_in_minutes: 120
agents:
system: x86_64-linux
queue: benchmark
if: 'build.env("step") == null || build.env("step") =~ /bench-db/'

- label: 'Latency benchmark'
command: "./.buildkite/bench-latency.sh"
timeout_in_minutes: 120
agents:
system: x86_64-linux
queue: benchmark
if: 'build.env("step") == null || build.env("step") =~ /bench-latency/'

# TODO: ADP-549 Port migrations test to shelley
# - label: 'Database Migrations Test'
Expand All @@ -45,6 +49,7 @@ steps:
# timeout_in_minutes: 60
# agents:
# system: x86_64-linux
# if: 'build.env("step") == null || build.env("step") =~ /migration-tests/'

- label: 'Full cabal build'
command: 'nix-shell nix/cabal-shell.nix --arg withCabalCache true --run "scripts/buildkite/cabal-ci.sh build"'
Expand All @@ -53,10 +58,12 @@ steps:
CABAL_STORE_DIR: "/build/cardano-wallet.store"
agents:
system: x86_64-linux
if: 'build.env("step") == null || build.env("step") =~ /cabal/'

- wait

- label: "Advance linux-tests-pass and all-tests-pass branches"
command: "./.buildkite/push-branch.sh linux-tests-pass windows-tests-pass all-tests-pass"
agents:
system: x86_64-linux
if: 'build.env("step") == null'
8 changes: 4 additions & 4 deletions lib/core/cardano-wallet-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ library
, ouroboros-consensus
, ouroboros-network
, path-pieces
, persistent
, persistent-sqlite
, persistent-template
, persistent ==2.11.0.4
, persistent-sqlite ==2.11.1.0
, persistent-template ==2.9.1.0
, pretty-simple
, profunctors
, quiet
Expand Down Expand Up @@ -309,7 +309,7 @@ test-suite unit
, servant-server
, should-not-typecheck
, strict-non-empty-containers
, openapi3 >= 3.0.0.1
, openapi3 >= 3.0.0.1 && < 3.1.0
, servant-openapi3
, string-qq
, temporary
Expand Down