From cae94a40cf41371f465d5ad493091e2a032d3a07 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Fri, 20 May 2022 19:47:24 +0000 Subject: [PATCH] Adapt cabal build after merge into mono repo --- cabal.project | 509 ++++++++++++++-------- cardano-tracer/cardano-tracer.cabal | 4 +- ekg-forward/ekg-forward.cabal | 4 +- network-mux/network-mux.cabal | 3 +- ouroboros-network/ouroboros-network.cabal | 3 +- 5 files changed, 324 insertions(+), 199 deletions(-) diff --git a/cabal.project b/cabal.project index 7ef9fe5655..6d677ef98e 100644 --- a/cabal.project +++ b/cabal.project @@ -2,8 +2,12 @@ index-state: 2022-02-18T00:00:00Z packages: + bench/cardano-topology + bench/locli + bench/tx-generator cardano-api cardano-cli + cardano-client cardano-client-demo cardano-git-rev cardano-node @@ -12,133 +16,81 @@ packages: cardano-submit-api cardano-testnet cardano-tracer - bench/cardano-topology - bench/locli - bench/tx-generator + ekg-forward + eras/alonzo/impl + eras/alonzo/test-suite + eras/babbage/impl + eras/babbage/test-suite + eras/byron/chain/executable-spec + eras/byron/crypto + eras/byron/crypto/test + eras/byron/ledger/executable-spec + eras/byron/ledger/impl + eras/byron/ledger/impl/test + eras/shelley-ma/impl + eras/shelley-ma/test-suite + eras/shelley/impl + eras/shelley/test-suite + io-classes + io-sim + libs/cardano-data + libs/cardano-ledger-core + libs/cardano-ledger-pretty + libs/cardano-ledger-test + libs/cardano-protocol-tpraos + libs/ledger-state + libs/non-integral + libs/plutus-preprocessor + libs/set-algebra + libs/small-steps + libs/small-steps-test + libs/vector-map + monoidal-synchronisation + network-mux + ntp-client + ouroboros-consensus + ouroboros-consensus-byron + ouroboros-consensus-byron-test + ouroboros-consensus-byronspec + ouroboros-consensus-cardano + ouroboros-consensus-cardano-test + ouroboros-consensus-mock + ouroboros-consensus-mock-test + ouroboros-consensus-protocol + ouroboros-consensus-shelley + ouroboros-consensus-shelley-test + ouroboros-consensus-test + ouroboros-network + ouroboros-network-framework + ouroboros-network-testing + strict-stm trace-dispatcher - trace-resources trace-forward + trace-resources + typed-protocols + typed-protocols-cborg + typed-protocols-examples -package cardano-api - ghc-options: -Werror - -package cardano-cli - ghc-options: -Werror - -package cardano-git-rev - ghc-options: -Werror - -package cardano-node - ghc-options: -Werror - -package cardano-node-chairman - ghc-options: -Werror - -package cardano-testnet - ghc-options: -Werror - -package tx-generator - ghc-options: -Werror - -package trace-dispatcher - ghc-options: -Werror - -package trace-resources - ghc-options: -Werror - -package cardano-tracer - ghc-options: -Werror - -package cryptonite - -- Using RDRAND instead of /dev/urandom as an entropy source for key - -- generation is dubious. Set the flag so we use /dev/urandom by default. - flags: -support_rdrand - --- --------------------------------------------------------- --- Disable all tests by default +constraints: + hedgehog >= 1.0 + , bimap >= 0.4.0 + , libsystemd-journal >= 1.4.4 + , systemd >= 2.3.0 + -- systemd-2.3.0 requires at least network 3.1.1.0 but it doesn't declare + -- that dependency + , network >= 3.1.1.0 + -- bizarre issue: in earlier versions they define their own 'GEq', in newer + -- ones they reuse the one from 'some', but there isn't e.g. a proper version + -- constraint from dependent-sum-template (which is the library we actually use). + , dependent-sum > 0.6.2.0 -tests: False +allow-newer: + *:aeson, + monoidal-containers:aeson, + size-based:template-haskell test-show-details: direct --- Then enable specific tests in this repo - -package cardano-api - tests: True - -package cardano-cli - tests: True - -package cardano-node - tests: True - -package cardano-node-chairman - tests: True - -package cardano-submit-api - tests: True - -package cardano-testnet - tests: True - -package trace-resources - tests: True - -package trace-dispatcher - tests: True - -package trace-forward - tests: True - -package cardano-tracer - tests: True - -package trace-resources - tests: True - --- The following is needed because Nix is doing something crazy. -package byron-spec-ledger - tests: False - -package vector-map - ghc-options: -Werror - -package iohk-monitoring - tests: False - -package ouroboros-consensus-test - tests: False - -package ouroboros-consensus-cardano-test - tests: False - -package ouroboros-network - tests: False - -package ouroboros-network-framework - tests: False - -package plutus-tx - tests: False - -package prettyprinter-configurable - tests: False - -package small-steps - tests: False - -package small-steps-test - tests: False - -package goblins - tests: False - -package io-classes - tests: False - -package cardano-ledger-alonzo-test - tests: False - -- --------------------------------------------------------- -- The two following one-liners will cut off / restore the remainder of this file (for nix-shell users): @@ -182,41 +134,36 @@ source-repository-package slotting strict-containers + source-repository-package type: git - location: https://github.com/input-output-hk/cardano-crypto - tag: f73079303f663e028288f9f4a9e08bcca39a923e - --sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q + location: https://github.com/input-output-hk/io-sim + tag: 606de33fa2f467d108fb1efb86daeb3348bf34e3 + --sha256: 048djqfdkzrbmdz670knbkjy12wddpvsmhm4x5yldg3w9lwqi1yx + subdir: + io-classes + io-sim + strict-stm + strict-stm source-repository-package type: git - location: https://github.com/input-output-hk/cardano-ledger - tag: e0c0281a047d3b8da2477c688e926a50f7509990 - --sha256: 09m8wkp7icafnzjy5vjswakmg3y11n4lxb775i12f55kafx4g4kp + location: https://github.com/input-output-hk/typed-protocols + tag: 91c3fba44d68439df207796171cd6f867354b76b + --sha256: 1h1nh10859kd7j8bb55y577jfdp42aqpppx8fn0pm6fra5748a50 subdir: - eras/alonzo/impl - eras/alonzo/test-suite - eras/babbage/impl - eras/babbage/test-suite - eras/byron/chain/executable-spec - eras/byron/crypto - eras/byron/crypto/test - eras/byron/ledger/executable-spec - eras/byron/ledger/impl - eras/byron/ledger/impl/test - eras/shelley/impl - eras/shelley/test-suite - eras/shelley-ma/impl - eras/shelley-ma/test-suite - libs/cardano-ledger-core - libs/cardano-ledger-pretty - libs/cardano-protocol-tpraos - libs/cardano-data - libs/vector-map - libs/set-algebra - libs/small-steps - libs/small-steps-test - libs/non-integral + typed-protocols + typed-protocols + typed-protocols-cborg + typed-protocols-cborg + typed-protocols-examples + typed-protocols-examples + +source-repository-package + type: git + location: https://github.com/input-output-hk/cardano-crypto + tag: f73079303f663e028288f9f4a9e08bcca39a923e + --sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q source-repository-package type: git @@ -254,29 +201,6 @@ source-repository-package tag: 3825d3abf75f83f406c1f7161883c438dac7277d --sha256: 19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx -source-repository-package - type: git - location: https://github.com/input-output-hk/ouroboros-network - tag: 51cfa723e5057c74043d2dbab09572fc5b099e8a - --sha256: 02q463k6mv697zs5jffbi7gflz687957gni1hx9cgywgq6yi1wsj - subdir: - io-sim - io-classes - monoidal-synchronisation - network-mux - ouroboros-consensus - ouroboros-consensus-byron - ouroboros-consensus-cardano - ouroboros-consensus-protocol - ouroboros-consensus-shelley - ouroboros-network - ouroboros-network-framework - ouroboros-network-testing - strict-stm - typed-protocols - typed-protocols-cborg - typed-protocols-examples - source-repository-package type: git location: https://github.com/input-output-hk/plutus @@ -291,12 +215,6 @@ source-repository-package stubs/plutus-ghc-stub word-array -source-repository-package - type: git - location: https://github.com/input-output-hk/ekg-forward - tag: 297cd9db5074339a2fb2e5ae7d0780debb670c63 - --sha256: 1zcwry3y5rmd9lgxy89wsb3k4kpffqji35dc7ghzbz603y1gy24g - source-repository-package type: git location: https://github.com/HeinrichApfelmus/threepenny-gui @@ -310,22 +228,231 @@ source-repository-package tag: ee59880f47ab835dbd73bea0847dab7869fc20d8 --sha256: 1lrzknw765pz2j97nvv9ip3l1mcpf2zr4n56hwlz0rk7wq7ls4cm -constraints: - hedgehog >= 1.0 - , bimap >= 0.4.0 - , libsystemd-journal >= 1.4.4 - , systemd >= 2.3.0 - -- systemd-2.3.0 requires at least network 3.1.1.0 but it doesn't declare - -- that dependency - , network >= 3.1.1.0 +-- https://github.com/fpco/weigh/pull/47 +source-repository-package + type: git + location: https://github.com/TeofilC/weigh.git + tag: 8a3b2283c3e73a84ad1da6cb35a39d886c44772c + --sha256: 13cnj7l50ihxhhrfl0j6xv64rw7xiq9c8nbwzqdzr6lkk3w7awmx + + +package cryptonite + -- Using RDRAND instead of /dev/urandom as an entropy source for key + -- generation is dubious. Set the flag so we use /dev/urandom by default. + flags: -support_rdrand + +package io-sim + -- NOTE: to enable benchmarks, one needs to disable tests for -- + -- `typed-protocols-examples`. This won't be a problem, once `io-sim` lands + -- in its own repository. + benchmarks: False package comonad flags: -test-doctests +-- Have to specify '-Werror' for each package until this is released: +-- https://github.com/haskell/cabal/issues/3579 + +package byron-spec-chain + ghc-options: -Werror + +package byron-spec-ledger + ghc-options: -Werror + +package cardano-api + ghc-options: -Werror + +package cardano-cli + ghc-options: -Werror + +package cardano-client + ghc-options: -Werror + +package cardano-client-demo + ghc-options: -Werror + +package cardano-crypto-test + ghc-options: -Werror + +package cardano-crypto-wrapper + ghc-options: -Werror + +package cardano-data + ghc-options: -Werror + +package cardano-git-rev + ghc-options: -Werror + +package cardano-ledger-alonzo + ghc-options: -Werror + package cardano-ledger-alonzo-test - tests: False + ghc-options: -Werror -allow-newer: - *:aeson, - monoidal-containers:aeson, - size-based:template-haskell +package cardano-ledger-babbage + ghc-options: -Werror + +package cardano-ledger-babbage-test + ghc-options: -Werror + +package cardano-ledger-byron + ghc-options: -Werror + +package cardano-ledger-byron-test + ghc-options: -Werror + +package cardano-ledger-core + ghc-options: -Werror + +package cardano-ledger-pretty + ghc-options: -Werror + +package cardano-ledger-shelley + ghc-options: -Werror + +package cardano-ledger-shelley-ma + ghc-options: -Werror + +package cardano-ledger-shelley-ma-test + ghc-options: -Werror + +package cardano-ledger-shelley-test + ghc-options: -Werror + +package cardano-ledger-test + ghc-options: -Werror + +package cardano-node + ghc-options: -Werror + +package cardano-node-capi + ghc-options: -Werror + +package cardano-node-chairman + ghc-options: -Werror + +package cardano-protocol-tpraos + ghc-options: -Werror + +package cardano-submit-api + ghc-options: -Werror + +package cardano-testnet + ghc-options: -Werror + +package cardano-topology + ghc-options: -Werror + +package cardano-tracer + ghc-options: -Werror + +package ekg-forward + ghc-options: -Werror + +package io-classes + ghc-options: -Werror + +package io-sim + ghc-options: -Werror + +package ledger-state + ghc-options: -Werror + +package locli + ghc-options: -Werror + +package monoidal-synchronisation + ghc-options: -Werror + +package network-mux + ghc-options: -Werror + +package non-integral + ghc-options: -Werror + +package ntp-client + ghc-options: -Werror + +package ouroboros-consensus + ghc-options: -Werror + +package ouroboros-consensus-byron + ghc-options: -Werror + +package ouroboros-consensus-byron-test + ghc-options: -Werror + +package ouroboros-consensus-byronspec + ghc-options: -Werror + +package ouroboros-consensus-cardano + ghc-options: -Werror + +package ouroboros-consensus-cardano-test + ghc-options: -Werror + +package ouroboros-consensus-mock + ghc-options: -Werror + +package ouroboros-consensus-mock-test + ghc-options: -Werror + +package ouroboros-consensus-protocol + ghc-options: -Werror + +package ouroboros-consensus-shelley + ghc-options: -Werror + +package ouroboros-consensus-shelley-test + ghc-options: -Werror + +package ouroboros-consensus-test + ghc-options: -Werror + +package ouroboros-network + ghc-options: -Werror + +package ouroboros-network-framework + ghc-options: -Werror + +package ouroboros-network-testing + ghc-options: -Werror + +package plutus-preprocessor + ghc-options: -Werror + +package set-algebra + ghc-options: -Werror + +package small-steps + ghc-options: -Werror + +package small-steps-test + ghc-options: -Werror + +package strict-stm + ghc-options: -Werror + +package trace-dispatcher + ghc-options: -Werror + +package trace-forward + ghc-options: -Werror + +package trace-resources + ghc-options: -Werror + +package tx-generator + ghc-options: -Werror + +package typed-protocols + ghc-options: -Werror + +package typed-protocols-cborg + ghc-options: -Werror + +package typed-protocols-examples + ghc-options: -Werror + +package vector-map + ghc-options: -Werror diff --git a/cardano-tracer/cardano-tracer.cabal b/cardano-tracer/cardano-tracer.cabal index 4483f3fbbf..66cd35a42a 100644 --- a/cardano-tracer/cardano-tracer.cabal +++ b/cardano-tracer/cardano-tracer.cabal @@ -124,7 +124,7 @@ library demo-forwarder-lib , trace-dispatcher , trace-forward -executable demo-forwarder +executable cardano-tracer-demo-forwarder import: base, project-config hs-source-dirs: demo/ssh @@ -153,7 +153,7 @@ library demo-acceptor-lib , text , trace-forward -executable demo-acceptor +executable cardano-tracer-demo-acceptor import: base, project-config hs-source-dirs: demo diff --git a/ekg-forward/ekg-forward.cabal b/ekg-forward/ekg-forward.cabal index 2f2c525dc8..4cbfab9047 100644 --- a/ekg-forward/ekg-forward.cabal +++ b/ekg-forward/ekg-forward.cabal @@ -73,7 +73,7 @@ library , typed-protocols-cborg , unordered-containers -executable demo-forwarder +executable ekg-forward-demo-forwarder hs-source-dirs: demo main-is: forwarder.hs build-depends: base @@ -89,7 +89,7 @@ executable demo-forwarder -rtsopts -with-rtsopts=-T -executable demo-acceptor +executable ekg-forward-demo-acceptor hs-source-dirs: demo main-is: acceptor.hs build-depends: base diff --git a/network-mux/network-mux.cabal b/network-mux/network-mux.cabal index 0fa0bceb65..a1e9e47316 100644 --- a/network-mux/network-mux.cabal +++ b/network-mux/network-mux.cabal @@ -21,8 +21,7 @@ flag asserts Flag ipv6 Description: Enable IPv6 test cases Manual: True - -- Default to False since travis lacks IPv6 support - Default: False + Default: True Flag tracetcpinfo Description: Enable costly Linux only tracing of the kernel's tcpinfo diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal index 1fe9a4bde6..451c14fe91 100644 --- a/ouroboros-network/ouroboros-network.cabal +++ b/ouroboros-network/ouroboros-network.cabal @@ -32,8 +32,7 @@ flag asserts Flag ipv6 Description: Enable IPv6 test cases Manual: True - -- Default to False since travis lacks IPv6 support - Default: False + Default: True flag cddl Description: Enable CDDL based tests of the CBOR encoding