Merge pull request #5680 from IntersectMBO/sl/node-8.8.1

blst version upgrade and CHaP bump
IntersectMBO · Feb 21, 2024 · 968432e · 968432e
2 parents ea26fda + 9c561e2
commit 968432e
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 40 deletions.
diff --git a/.github/workflows/release-upload.yaml b/.github/workflows/release-upload.yaml
@@ -46,7 +46,9 @@ jobs:
     needs: [wait-for-hydra]
     strategy:
       matrix:
-        arch: [linux, macos, win64]
+        # Disable windows until libblst works for windows cross compilation builds 
+        # arch: [linux, macos, win64]
+        arch: [linux, macos]
     name: "Download Asset from the Cache"
     runs-on: ubuntu-latest
     steps:
@@ -95,14 +97,16 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: ${{ github.sha }}-macos
-      - uses: actions/download-artifact@v3
-        with:
-          name: ${{ github.sha }}-win64
+      # Disable windows until libblst works for windows cross compilation builds 
+      # - uses: actions/download-artifact@v3
+      #   with:
+      #     name: ${{ github.sha }}-win64
       - name: Release
         uses: input-output-hk/action-gh-release@v1
         with:
           draft: true
           files: |
-            cardano-node-*-win64.zip
+            # Disable windows until libblst works for windows cross compilation builds 
+            # cardano-node-*-win64.zip
             cardano-node-*-macos.tar.gz
             cardano-node-*-linux.tar.gz
diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal
@@ -100,7 +100,7 @@ library
                       , bytestring
                       , cardano-api ^>= 8.38
                       , cardano-binary
-                      , cardano-cli ^>= 8.20.0.0
+                      , cardano-cli ^>= 8.20.1.0
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data

diff --git a/cabal.project b/cabal.project
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2024-02-06T15:14:59Z
-  , cardano-haskell-packages 2024-02-07T07:51:35Z
+  , cardano-haskell-packages 2024-02-20T15:00:00Z
 
 packages:
   cardano-git-rev

diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-node
-version:                8.8.0
+version:                8.8.1
 synopsis:               The cardano full node
 description:            The cardano full node.
 category:               Cardano,

diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal
@@ -41,7 +41,7 @@ library
                       , bytestring
                       , cardano-api ^>= 8.38
                       , cardano-binary
-                      , cardano-cli ^>= 8.20.0.0
+                      , cardano-cli ^>= 8.20.1.0
                       , cardano-crypto-class ^>= 2.1.2
                       , http-media
                       , iohk-monitoring

diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal
@@ -35,7 +35,7 @@ library
                       , ansi-terminal
                       , bytestring
                       , cardano-api ^>= 8.38
-                      , cardano-cli ^>= 8.20.0.0
+                      , cardano-cli ^>= 8.20.1.0
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-ledger-alonzo

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -285,26 +285,27 @@
                   internal.roots.project = muslProject.roots;
                   variants = mapAttrs (_: v: removeAttrs v.musl ["variants"]) ciJobsVariants;
                 };
-              windows =
-                let
-                  windowsProject = project.projectCross.mingwW64;
-                  projectExes = collectExes windowsProject;
-                in
-                projectExes
-                  // (removeRecurse {
-                  inherit (windowsProject) checks tests benchmarks;
-                  cardano-node-win64 = import ./nix/binary-release.nix {
-                    inherit pkgs;
-                    inherit (exes.cardano-node.identifier) version;
-                    platform = "win64";
-                    exes = lib.collect lib.isDerivation (
-                      # FIXME: restore tx-generator once plutus-scripts-bench is fixed for windows:
-                      removeAttrs projectExes [ "tx-generator" ]
-                    );
-                  };
-                  internal.roots.project = windowsProject.roots;
-                  variants = mapAttrs (_: v: removeAttrs v.windows ["variants"]) ciJobsVariants;
-                });
+              # Disable windows until libblst works for windows cross compilation builds
+              #windows =
+              #  let
+              #    windowsProject = project.projectCross.mingwW64;
+              #    projectExes = collectExes windowsProject;
+              #  in
+              #  projectExes
+              #    // (removeRecurse {
+              #    inherit (windowsProject) checks tests benchmarks;
+              #    cardano-node-win64 = import ./nix/binary-release.nix {
+              #      inherit pkgs;
+              #      inherit (exes.cardano-node.identifier) version;
+              #      platform = "win64";
+              #      exes = lib.collect lib.isDerivation (
+              #        # FIXME: restore tx-generator once plutus-scripts-bench is fixed for windows:
+              #        removeAttrs projectExes [ "tx-generator" ]
+              #      );
+              #    };
+              #    internal.roots.project = windowsProject.roots;
+              #    variants = mapAttrs (_: v: removeAttrs v.windows ["variants"]) ciJobsVariants;
+              #  });
             } // optionalAttrs (system == "x86_64-darwin") {
               native = lib.filterAttrs
                 (n: _: