Merge pull request #1 from holochain/bundle

Add bundles
holochain · Jun 24, 2024 · ffbb237 · ffbb237
2 parents 3505a15 + f1fe26f
commit ffbb237
Show file tree

Hide file tree

Showing 3 changed files with 166 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build-holochain:
@@ -82,4 +85,39 @@ jobs:
           install_url: https://releases.nixos.org/nix/nix-2.20.4/install
 
       - name: Build for x86_64-apple-darwin
-        run: nix build .#lair_keystore_aarch64-apple
+        run: nix build .#lair_keystore_aarch64-apple
+
+  bundle-x86-64-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install nix
+        uses: cachix/install-nix-action@v26
+        with:
+          install_url: https://releases.nixos.org/nix/nix-2.20.4/install
+
+      - name: Build Lair Keystore
+        run: |
+          nix bundle .#holonix_lair_keystore
+          ./lair-keystore --version
+
+      - name: Build Holochain
+        run: |
+          nix bundle .#holonix_holochain
+          ./holochain --version
+
+      - name: Build hc CLI
+        run: |
+          nix bundle .#holonix_hc
+          ./hc --version
+
+      - name: Build hc-run-local-services CLI
+        run: |
+          nix bundle .#holonix_hc_run_local_services
+          ./hc-run-local-services --version
+
+      - name: Build hcterm CLI
+        run: |
+          nix bundle .#holonix_hcterm
+          ./hcterm --version
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -33,13 +33,24 @@
       url = "github:holochain/lair";
       flake = false;
     };
+
+    holonix = {
+      url = "github:holochain/holonix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.crane.follows = "crane";
+      inputs.rust-overlay.follows = "rust-overlay";
+      inputs.holochain.follows = "holochain";
+      inputs.lair-keystore.follows = "lair-keystore";
+    };
   };
 
   outputs = inputs @ { nixpkgs, crane, flake-utils, rust-overlay, ... }:
     flake-utils.lib.eachDefaultSystem
       (localSystem: {
         packages =
           let
+            pkgs = nixpkgs.legacyPackages.${localSystem};
+
             defineHolochainPackages = { crate, package }: {
               "${package}_aarch64-linux" = import ./modules/holochain-cross.nix {
                 inherit localSystem inputs crate package;
@@ -87,12 +98,27 @@
                 rustTargetTriple = "aarch64-apple-darwin";
               };
             } else { });
+
+            extractHolochainBin = bin: pkgs.stdenv.mkDerivation {
+              name = bin;
+              unpackPhase = "true";
+              installPhase = ''
+                mkdir -p $out/bin
+                cp ${inputs.holonix.packages.${localSystem}.holochain}/bin/${bin} $out/bin
+              '';
+            };
           in
           (defineHolochainPackages { crate = "holochain"; package = "holochain"; }) //
           (defineHolochainPackages { crate = "hc"; package = "holochain_cli"; }) //
           (defineHolochainPackages { crate = "hc_run_local_services"; package = "holochain_cli_run_local_services"; }) //
           (defineHolochainPackages { crate = "holochain_terminal"; package = "hcterm"; }) //
-          (defineLairKeystorePackages { })
+          (defineLairKeystorePackages { }) // (if localSystem != "aarch64-linux" then {
+            holonix_holochain = extractHolochainBin "holochain";
+            holonix_hc = extractHolochainBin "hc";
+            holonix_hc_run_local_services = extractHolochainBin "hc-run-local-services";
+            holonix_hcterm = extractHolochainBin "hcterm";
+            holonix_lair_keystore = inputs.holonix.packages.${localSystem}.lair-keystore;
+          } else { })
         ;
       }) // {
       # Add dev helpers that are not required to be platform agnostic