Use cardano-cli from CHaP

IntersectMBO · May 29, 2023 · ae0cdda · ae0cdda
1 parent ba75003
commit ae0cdda
Show file tree

Hide file tree

Showing 368 changed files with 23 additions and 28,950 deletions.
diff --git a/.github/workflows/haskell-linux.yml b/.github/workflows/haskell-linux.yml
@@ -147,6 +147,12 @@ jobs:
         skip: "${{ vars.BINARY_CACHE_URI != '' }}"
         enable-save: false
 
+    - name: Build core components
+      run: |
+        # The tests call out to msys2 commands. We generally do not want to mix toolchains, so
+        # we are very deliberate about only adding msys64 to the path where absolutely necessary.
+        ${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
+        cabal build cardano-node cardano-cli cardano-node-chairman cardano-submit-api
 
     - name: Build remaining components
       run: cabal build all
@@ -156,7 +162,7 @@ jobs:
         TMPDIR: ${{ runner.temp }}
         TMP: ${{ runner.temp }}
         KEEP_WORKSPACE: 1
-      run: cabal test cardano-testnet cardano-node cardano-node-chairman cardano-cli cardano-submit-api
+      run: cabal test cardano-testnet cardano-node cardano-node-chairman cardano-submit-api
 
     - name: Tar failed tests workspaces
       if: ${{ failure() }}

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -167,7 +167,7 @@ jobs:
         # The tests call out to msys2 commands. We generally do not want to mix toolchains, so
         # we are very deliberate about only adding msys64 to the path where absolutely necessary.
         ${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
-        cabal build cardano-node cardano-cli cardano-node-chairman cardano-submit-api -j1
+        cabal build cardano-node cardano-cli cardano-node-chairman cardano-submit-api
 
     - name: Build remaining components
       run: |
@@ -185,7 +185,7 @@ jobs:
         # The tests call out to msys2 commands. We generally do not want to mix toolchains, so
         # we are very deliberate about only adding msys64 to the path where absolutely necessary.
         ${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }}
-        cabal test cardano-testnet cardano-node cardano-node-chairman cardano-cli cardano-submit-api
+        cabal test cardano-testnet cardano-node cardano-node-chairman cardano-submit-api
 
     - name: Tar failed tests workspaces
       if: ${{ failure() }}

diff --git a/.github/workflows/stylish-haskell.yml b/.github/workflows/stylish-haskell.yml
@@ -42,7 +42,6 @@ jobs:
         cardano-node-capi
         trace-dispatcher
         trace-forward
-        cardano-cli
         cardano-submit-api
 
     steps:

diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal
@@ -91,7 +91,7 @@ library
                       , bytestring
                       , cardano-api ^>= 8.1.0.1
                       , cardano-binary
-                      , cardano-cli
+                      , cardano-cli ^>= 7.0.0.0
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data
@@ -186,7 +186,7 @@ test-suite tx-generator-apitest
                       , filepath
                       , optparse-applicative-fork
                       , cardano-api ^>= 8.1.0.1
-                      , cardano-cli
+                      , cardano-cli ^>= 7.0.0.0
                       , cardano-node
                       , plutus-scripts-bench
                       , plutus-tx
@@ -203,7 +203,7 @@ test-suite tx-generator-apitest
                      , filepath
                      , optparse-applicative-fork
                      , cardano-api ^>= 8.1.0.1
-                     , cardano-cli
+                     , cardano-cli ^>= 7.0.0.0
                      , cardano-node
                      , transformers
                      , transformers-except

diff --git a/cabal.project b/cabal.project
@@ -14,10 +14,9 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2023-05-10T10:34:57Z
-  , cardano-haskell-packages 2023-05-25T10:00:00Z
+  , cardano-haskell-packages 2023-05-29T01:40:13Z
 
 packages:
-    cardano-cli
     cardano-client-demo
     cardano-git-rev
     cardano-node
@@ -37,9 +36,6 @@ packages:
 package cardano-api
   ghc-options: -Werror
 
-package cardano-cli
-  ghc-options: -Werror
-
 package cardano-client-demo
   ghc-options: -Werror