Merge pull request #4965 from input-output-hk/andreabedini/fix-flake

Fix flake (again)
IntersectMBO · Mar 14, 2023 · 418aa1c · 418aa1c
2 parents a16c198 + e4e2928
commit 418aa1c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 45 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -14,10 +14,6 @@
       url = "github:input-output-hk/hackage.nix";
       flake = false;
     };
-    nixTools = {
-      url = "github:input-output-hk/nix-tools";
-      flake = false;
-    };
     haskellNix = {
       url = "github:input-output-hk/haskell.nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -323,16 +319,20 @@
               };
             };
             nonRequiredPaths = [
-              # hlint required status is controled via the github action:
-              "native\\.(.*\\.)?checks/hlint"
+              #FIXME: hydraJobs.native.workbench-ci-test need some work to support Conway
+              "native\\.(.*\\.)?workbench-ci-test"
               #FIXME: cardano-tracer-test for windows should probably be disabled in haskell.nix config:
               "windows\\.(.*\\.)?checks\\.cardano-tracer\\.cardano-tracer-test"
               #FIXME: plutus-scripts-bench (dep of tx-generator) does not compile for windows:
               "windows\\.(.*\\.)?tx-generator.*"
+              # hlint required status is controled via the github action:
+              "native\\.(.*\\.)?checks/hlint"
+              #system-tests are build and run separately:
+              "native\\.(.*\\.)?system-tests"
             ] ++
             lib.optionals (system == "x86_64-darwin") [
-              #FIXME:  ExceptionInLinkedThread (ThreadId 253) pokeSockAddr: path is too long
-              "native\\.(.*\\.)?.checks/cardano-testnet/cardano-testnet-tests"
+              #FIXME: make variants nonrequired for macos until CI has more capacity for macos builds
+              "native\\.variants\\..*"
             ];
           in
           pkgs.callPackages iohkNix.utils.ciJobsAggregates

diff --git a/nix/haskell.nix b/nix/haskell.nix
@@ -21,7 +21,7 @@ let
       name = "cardano-node";
       compiler-nix-name = lib.mkDefault "ghc8107";
       # extra-compilers
-      flake.variants = lib.genAttrs ["ghc927"] (x: {compiler-nix-name = x;});
+      flake.variants = lib.genAttrs ["ghc925"] (x: {compiler-nix-name = x;});
       cabalProjectLocal = ''
         allow-newer: terminfo:base
       '' + lib.optionalString pkgs.stdenv.hostPlatform.isWindows ''
@@ -110,6 +110,12 @@ let
                 "configuration/cardano/mainnet-byron-genesis.json"
                 "configuration/cardano/mainnet-shelley-genesis.json"
                 "configuration/cardano/mainnet-alonzo-genesis.json"
+                "configuration/cardano/mainnet-conway-genesis.json"
+              ];
+              goldenConfigFiles = [
+                "configuration/defaults/byron-mainnet"
+                "cardano-cli/test/data/golden/alonzo/genesis.alonzo.spec.json"
+                "cardano-cli/test/data/golden/conway/genesis.conway.spec.json"
               ];
             in
             {
@@ -151,10 +157,7 @@ let
               packages.cardano-node-chairman.preCheck =
                 let
                   # This define files included in the directory that will be passed to `H.getProjectBase` for this test:
-                  filteredProjectBase = incl ../. [
-                    "configuration/defaults/byron-mainnet"
-                    "cardano-cli/test/data/golden/alonzo/genesis.alonzo.spec.json"
-                  ];
+                  filteredProjectBase = incl ../. goldenConfigFiles;
                 in
                 ''
                   ${exportCliPath}
@@ -166,11 +169,11 @@ let
               packages.cardano-testnet.preCheck =
                 let
                   # This define files included in the directory that will be passed to `H.getProjectBase` for this test:
-                  filteredProjectBase = incl ../. (mainnetConfigFiles ++ [
+                  filteredProjectBase = incl ../. (mainnetConfigFiles ++ goldenConfigFiles ++ [
                     "configuration/cardano/mainnet-topology.json"
-                    "configuration/defaults/byron-mainnet"
-                    "cardano-cli/test/data/golden/alonzo/genesis.alonzo.spec.json"
+                    "configuration/cardano/mainnet-conway-genesis.json"
                     "scripts/babbage/alonzo-babbage-test-genesis.json"
+                    "scripts/babbage/conway-babbage-test-genesis.json"
                   ]);
                 in
                 ''

diff --git a/nix/nixos/tests/cardano-node-edge.nix b/nix/nixos/tests/cardano-node-edge.nix
@@ -52,9 +52,10 @@ with pkgs;
     machine.wait_for_open_port(12798)
     machine.wait_for_open_port(3001)
     machine.succeed("systemctl status cardano-node")
-    machine.succeed(
-        "${cardanoNodePackages.cardano-ping}/bin/cardano-ping -h 127.0.0.1 -c 1 -q --json | ${jq}/bin/jq -c"
-    )
+    # FIXME reenable and check the cli syntax when https://github.com/input-output-hk/cardano-node/pull/4664 is merged
+    #machine.succeed(
+    #    "${cardanoNodePackages.cardano-cli}/bin/cardano-cli ping -h 127.0.0.1 -c 1 -q --json | ${jq}/bin/jq -c"
+    #)
     machine.wait_for_open_port(8101)
     machine.succeed("systemctl status cardano-submit-api")
   '';