re-enable all builds

holochain · Jun 1, 2024 · 9b58450 · 9b58450
1 parent 45ea849
commit 9b58450
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 36 deletions.
diff --git a/.github/workflows/build-and-cache.yaml b/.github/workflows/build-and-cache.yaml
@@ -10,10 +10,8 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [macos-latest]
-        # os: [ubuntu-latest, macos-latest, macos-13]
-        package: [launcher]
-        # package: [holochain, lair-keystore, launcher]
+        os: [ubuntu-latest, macos-latest, macos-13]
+        package: [holochain, lair-keystore, hc-launch]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -33,15 +33,15 @@
       flake = false;
     };
 
-    # Holochain Launcher CLI
-    launcher-src = {
+    # Holochain Launch CLI
+    hc-launch-src = {
       url = "github:holochain/launcher/holochain-0.3";
       flake = false;
     };
   };
 
   # outputs that this flake should produce
-  outputs = inputs @ { self, nixpkgs, flake-parts, rust-overlay, crane, holochain-src, lair-keystore-src, launcher-src, ... }:
+  outputs = inputs @ { self, nixpkgs, flake-parts, rust-overlay, crane, holochain-src, lair-keystore-src, hc-launch-src, ... }:
     # refer to flake-parts docs https://flake.parts/
     flake-parts.lib.mkFlake { inherit inputs; } {
       # systems that his flake can be used on
@@ -124,8 +124,8 @@
               doCheck = false;
             };
 
-          # define how to build Holochain Launcher binary
-          launcher =
+          # define how to build hc-launch binary
+          hc-launch =
             let
               # Crane filters out all non-cargo related files. Define include filter with files needed for build.
               nonCargoBuildFiles = path: _type: builtins.match ".*(js|json|png)$" path != null;
@@ -139,20 +139,22 @@
               commonArgs = {
                 pname = "hc-launch";
                 version = "workspace";
-                # Use Launcher sources as defined in input dependencies and include only those files defined in the
+                # Use hc-launch sources as defined in input dependencies and include only those files defined in the
                 # filter previously.
                 src = pkgs.lib.cleanSourceWith {
-                  src = launcher-src;
+                  src = hc-launch-src;
                   filter = includeFilesFilter;
                 };
                 # Only build hc-launch command
                 cargoExtraArgs = "--bin hc-launch";
 
+                # commands required at build time
                 nativeBuildInputs = (
                   if pkgs.stdenv.isLinux then [ pkgs.pkg-config ]
                   else [ ]
                 );
 
+                # build inputs required for linking to execute at runtime
                 buildInputs = [
                   pkgs.perl
                 ]
@@ -207,18 +209,18 @@
         {
 
           packages = {
-            # inherit holochain;
-            # inherit lair-keystore;
-            # inherit rust;
-            inherit launcher;
+            inherit holochain;
+            inherit lair-keystore;
+            inherit rust;
+            inherit hc-launch;
           };
 
           devShells = {
             default = pkgs.mkShell {
               packages = [
-                # holochain
-                # lair-keystore
-                # rust
+                holochain
+                lair-keystore
+                rust
               ];
             };
           };