Merge pull request #114 from holochain/holochain-0.1-plus-main

Merging changes from main into holochain-0.1
holochain · Sep 14, 2023 · 4b63dd9 · 4b63dd9
2 parents 104a269 + 6614bef
commit 4b63dd9
Show file tree

Hide file tree

Showing 40 changed files with 744 additions and 241 deletions.
diff --git a/.github/actions/extend-space/action.yaml b/.github/actions/extend-space/action.yaml
@@ -58,4 +58,4 @@ runs:
           -o lowerdir=${HOME}_lower,upperdir=$EXTENDED_PATH/home/upper,workdir=$EXTENDED_PATH/home/work \
           $HOME
         sudo chown $(id -u):$(id -g) $HOME
-        df -h
+        df -h
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -15,7 +15,6 @@ jobs:
 
       - name: Extend space
         uses: ./.github/actions/extend-space
-
       - name: Install nix
         uses: cachix/install-nix-action@v18
         with:
@@ -30,5 +29,5 @@ jobs:
       - name: Install and test
         run: |
           cd $GITHUB_WORKSPACE
-          nix develop --command bash -c "cargo install --path . && sh run_test.sh"
+          nix develop --command bash -c "cargo install --force --locked --path . && sh run_test.sh"
 
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,4 @@ yarn-error.log*
 *.sln
 *.sw?
 result*
-.cargo
+.cargo