WIP

.envrc

@@ -0,0 +1 @@
+use flake .

.github/workflows/main.yml

@@ -6,9 +6,9 @@ name: CI
 # events but only for the main branch
 on:
   push:
-    branches: [ main ]
+    branches: [ main, develop ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, develop ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -23,27 +23,32 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - uses: cachix/install-nix-action@v12
+      - name: Install nix
+        uses: cachix/install-nix-action@v18
         with:
-          nix_path: nixpkgs=channel:nixos-unstable
+          install_url: https://releases.nixos.org/nix/nix-2.12.0/install
+          extra_nix_config: |
+            experimental-features = flakes nix-command
 
-      - name: cachix
-        run: |
-          nix-env -iA cachix -f https://cachix.org/api/v1/install
-          cachix use holochain-ci
+      - uses: cachix/cachix-action@v10
+        with:
+          name: holochain-ci
 
-      - name: build-holochain
-        run: |
-          cd $GITHUB_WORKSPACE
-          nix-shell . --run "npm install"
-          nix-shell . --run "npm run build:happ"
-          
-      - name: test-holochain
+      - uses: cachix/cachix-action@v10
+        with:
+          name: holochain-open-dev
+
+      - name: Install and test
         run: |
-          cd $GITHUB_WORKSPACE
-          nix-shell . --run "npm test"
-          
-      - name: build-ui
+          nix develop --command bash -c "npm i && npm t"
+
+      - name: Build UI
         run: |
-          cd $GITHUB_WORKSPACE
-          nix-shell . --run "cd ui && npm run lint && npm run build"
+          nix develop --command bash -c "npm run build -w ui"
+
+  update-nix-cache:
+      strategy:
+        matrix:
+          os: [ ubuntu-latest, ] 
+      needs: build-and-test
+      if: github.ref == 'refs/heads/master'

.gitignore

@@ -7,3 +7,5 @@ dist/
 *.happ
 *.webhapp
 storybook-static/
+.direnv
+result*

Cargo.toml

@@ -6,11 +6,12 @@ opt-level = "z"
 
 [workspace]
 members = ["dnas/*/zomes/integrity/*", "dnas/*/zomes/coordinator/*"]
+resolver = "2"
 
 [workspace.dependencies]
-hdi = "0.4.0-beta-dev.20"
-hdk = "0.3.0-beta-dev.24"
-holochain = "0.3.0-beta-dev.29"
+hdi = "0.4.0-beta-dev.28"
+hdk = "0.3.0-beta-dev.32"
+holochain = "0.3.0-beta-dev.38"
 
 serde = "1.0.193"
 

dnas/file_storage_provider/zomes/coordinator/file_storage/zome.nix

@@ -0,0 +1,16 @@
+{ inputs, rootPath, ... }:
+
+{
+  perSystem =
+    { inputs'
+    , ...
+    }: {
+      packages.file_storage_integrity = inputs.hcUtils.outputs.lib.rustZome {
+        workspacePath = rootPath;
+        holochain = inputs'.holochain;
+        crateCargoToml = ./Cargo.toml;
+      };
+  	};
+}
+
+

dnas/file_storage_provider/zomes/integrity/file_storage/src/lib.rs

@@ -13,7 +13,7 @@ pub struct FileMetadata {
 }
 
 #[cfg(feature = "externs")]
-#[hdk_entry_defs]
+#[hdk_entry_types]
 #[unit_enum(UnitEntryTypes)]
 pub enum EntryTypes {
     FileMetadata(FileMetadata),

dnas/file_storage_provider/zomes/integrity/file_storage/zome.nix

@@ -0,0 +1,21 @@
+{ inputs, rootPath, ... }:
+
+{
+  perSystem =
+    { inputs'
+    , config
+    , pkgs
+    , system
+    , lib
+    , options
+    , ...
+    }: {
+      packages.file_storage = inputs.hcUtils.outputs.lib.rustZome {
+        workspacePath = rootPath;
+        holochain = inputs'.holochain;
+        crateCargoToml = ./Cargo.toml;
+      };
+  	};
+}
+
+