Merge branch 'iohk-nix' of github.com:input-output-hk/daedalus into i…

…ohk-nix Pulls latest iohk-nix
input-output-hk · Dec 6, 2018 · b1f22ff · b1f22ff
2 parents eab4b17 + 305498f
commit b1f22ff
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 8 deletions.
diff --git a/bors.toml b/bors.toml
@@ -0,0 +1,17 @@
+status = [
+  # Buildkite: osx/linux installers
+  "buildkite/daedalus",
+
+  # Appveyor: windows installers
+  "continuous-integration/appveyor/branch",
+
+  # Hydra: we just care about tests attribute set
+  "ci/hydra:serokell:daedalus:tests.runFlow",
+  "ci/hydra:serokell:daedalus:tests.runLint",
+  "ci/hydra:serokell:daedalus:tests.runShellCheck"
+]
+timeout_sec = 7200
+required_approvals = 1
+cut_body_after = "## Type of change"
+delete_merged_branches = true
+block_labels = [ "DO NOT MERGE", "WIP" ]
diff --git a/default.nix b/default.nix
@@ -48,6 +48,8 @@ let
     };
     source = builtins.filterSource cleanSourceFilter ./.;
 
+    yaml2json = pkgs.haskell.lib.disableCabalFlag pkgs.haskellPackages.yaml "no-exe";
+
     tests = {
       runFlow = self.callPackage ./tests/flow.nix {};
       runLint = self.callPackage ./tests/lint.nix {};

diff --git a/release.nix b/release.nix
@@ -12,6 +12,12 @@ let
   };
   suffix = if buildNum == null then "" else "-${toString buildNum}";
   version = (builtins.fromJSON (builtins.readFile (./. + "/package.json"))).version;
+  yaml2json = let
+    daedalusPkgsWithSystem = system: import ./. { inherit system; };
+  in {
+    x86_64-linux = (daedalusPkgsWithSystem "x86_64-linux").yaml2json;
+    x86_64-darwin = (daedalusPkgsWithSystem "x86_64-darwin").yaml2json;
+  };
 
   makeJobs = cluster: with daedalusPkgs { inherit cluster; }; {
     inherit daedalus;
@@ -30,6 +36,6 @@ let
   lib = (import ./. {}).pkgs.lib;
   clusters = lib.splitString " " (builtins.replaceStrings ["\n"] [""] (builtins.readFile ./installer-clusters.cfg));
 in {
-  inherit shellEnvs;
+  inherit shellEnvs yaml2json;
   tests = (daedalusPkgs {}).tests;
 } // builtins.listToAttrs (map (x: { name = x; value = makeJobs x; }) clusters)
diff --git a/scripts/build-installer-unix.sh b/scripts/build-installer-unix.sh
@@ -129,12 +129,13 @@ pushd installers
           APP_NAME="csl-daedalus"
           rm -rf "${APP_NAME}"
 
-          INSTALLER_CMD="$INSTALLER/bin/make-installer ${test_installer}"
-          INSTALLER_CMD+="  --cardano          ${DAEDALUS_BRIDGE}"
-          INSTALLER_CMD+="  --build-job        ${build_id}"
-          INSTALLER_CMD+="  --cluster          ${cluster}"
-          INSTALLER_CMD+="  --out-dir          ${APP_NAME}"
-          nix-shell -p bash --run "${INSTALLER_CMD}"
+          INSTALLER_CMD=("$INSTALLER/bin/make-installer"
+                         "${test_installer}"
+                         "  --cardano          ${DAEDALUS_BRIDGE}"
+                         "  --build-job        ${build_id}"
+                         "  --cluster          ${cluster}"
+                         "  --out-dir          ${APP_NAME}")
+          ${INSTALLER_CMD[@]}
 
           if [ -d ${APP_NAME} ]; then
                   if [ -n "${BUILDKITE_JOB_ID:-}" ]

diff --git a/shell.nix b/shell.nix
@@ -13,8 +13,8 @@ in
 }:
 
 let
-  yaml2json = pkgs.haskell.lib.disableCabalFlag pkgs.haskellPackages.yaml "no-exe";
   daedalusPkgs = import ./. { inherit cluster; };
+  inherit (daedalusPkgs) yaml2json;
   yarn = pkgs.yarn.override { inherit nodejs; };
   nodejs = pkgs.nodejs-8_x;
   launcher-json = pkgs.runCommand "read-launcher-config.json" { buildInputs = [ yaml2json ]; } "yaml2json ${daedalusPkgs.daedalus.cfg}/etc/launcher-config.yaml > $out";