Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mjbrisebois committed Jul 10, 2023
2 parents 097a602 + 1b1ab2a commit 0214029
Show file tree
Hide file tree
Showing 29 changed files with 486 additions and 132 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DevHub.happ
devhub.happ
bundled/*.dna
zomes/*.wasm
node_modules
Expand Down
24 changes: 12 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SHELL = bash

NAME = devhub

HAPP_BUNDLE = DevHub.happ
HAPP_BUNDLE = devhub.happ
DNAREPO = bundled/dnarepo.dna
HAPPDNA = bundled/happs.dna
ASSETSDNA = bundled/web_assets.dna
Expand Down Expand Up @@ -104,7 +104,7 @@ use-local: use-local-client use-local-backdrop
use-npm: use-npm-client use-npm-backdrop

$(PORTAL_DNA):
wget -O $@ "https://github.com/holochain/portal-dna/releases/download/v$(NEW_PORTAL_VERSION)/portal.dna"
wget -O $@ "https://github.com/holochain/portal-dna/releases/download/v$(NEW_PORTAL_VERSION)/portal.dna" || rm -f $(PORTAL_DNA)
copy-portal-from-local:
cp ../app-store-dnas/bundled/portal.dna $(PORTAL_DNA)

Expand Down Expand Up @@ -183,20 +183,20 @@ clean-files-all: clean-remove-chaff
clean-files-all-force: clean-remove-chaff
git clean -fdx

PRE_HDK_VERSION = "0.2.0-beta-rc.4"
NEW_HDK_VERSION = "0.2.0"
PRE_HDK_VERSION = "0.3.0-beta-dev.2"
NEW_HDK_VERSION = "0.3.0-beta-dev.7"

PRE_HDI_VERSION = "0.3.0-beta-rc.3"
NEW_HDI_VERSION = "0.3.0"
PRE_HDI_VERSION = "0.4.0-beta-dev.1"
NEW_HDI_VERSION = "0.4.0-beta-dev.5"

PRE_CRUD_VERSION = "0.76.0"
NEW_CRUD_VERSION = "0.77.0"
PRE_CRUD_VERSION = "0.78.0"
NEW_CRUD_VERSION = "0.79.0"

PRE_MM_VERSION = "0.80.0"
NEW_MM_VERSION = "0.82.0"
PRE_MM_VERSION = "0.85.0"
NEW_MM_VERSION = "0.86.0"

# PRE_PORTAL_VERSION = "0.3.0"
NEW_PORTAL_VERSION = "0.4.0"
NEW_PORTAL_VERSION = "0.6.0"

GG_REPLACE_LOCATIONS = ':(exclude)*.lock' devhub_types/ zomes/*/

Expand All @@ -208,6 +208,6 @@ update-crud-version:
git grep -l '$(PRE_CRUD_VERSION)' -- $(GG_REPLACE_LOCATIONS) | xargs sed -i 's|$(PRE_CRUD_VERSION)|$(NEW_CRUD_VERSION)|g'
update-mere-memory-version:
git grep -l '$(PRE_MM_VERSION)' -- $(GG_REPLACE_LOCATIONS) | xargs sed -i 's|$(PRE_MM_VERSION)|$(NEW_MM_VERSION)|g'
rm zomes/mere_memory*.wasm
rm -f zomes/mere_memory*.wasm
update-portal-version:
rm -f $(PORTAL_DNA)
2 changes: 1 addition & 1 deletion bundled/dnarepo/dna.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ manifest_version: "1"
name: dnarepo
integrity:
origin_time: 2022-07-21T00:00:00.000000Z
network_seed: 00000000-0000-0000-0000-000000000000
network_seed: ~
properties: ~
zomes:
- name: dnarepo_core
Expand Down
2 changes: 1 addition & 1 deletion bundled/happs/dna.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ manifest_version: "1"
name: happs
integrity:
origin_time: 2022-07-21T00:00:00.000000Z
network_seed: 00000000-0000-0000-0000-000000000000
network_seed: ~
properties: ~
zomes:
- name: happs_core
Expand Down
2 changes: 1 addition & 1 deletion bundled/web_assets/dna.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ manifest_version: "1"
name: web_assets
integrity:
origin_time: 2022-07-21T00:00:00.000000Z
network_seed: 00000000-0000-0000-0000-000000000000
network_seed: ~
properties: ~
zomes:
- name: web_assets_core
Expand Down
47 changes: 24 additions & 23 deletions devhub_types/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions devhub_types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "devhub_types"
version = "0.2.0"
version = "0.3.0-beta-dev.7"
authors = ["Matthew Brisebois <matthew.brisebois@holo.host>"]
edition = "2018"

Expand All @@ -11,8 +11,8 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
essence_payloads = "0.1"
flate2 = "1"
hc_crud_ceps = "0.77.0"
hdk = "0.2.0"
hc_crud_ceps = "0.79.0"
hdk = "0.3.0-beta-dev.7"
hex = "0"
rmp-serde = "0.15.5"
serde = "1"
Expand Down
2 changes: 1 addition & 1 deletion devhub_types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ pub fn fmt_tag( tag: &Option<Vec<u8>> ) -> String {
}


fn zome_call_response_as_result(response: ZomeCallResponse) -> AppResult<zome_io::ExternIO> {
fn zome_call_response_as_result(response: ZomeCallResponse) -> AppResult<ExternIO> {
Ok( match response {
ZomeCallResponse::Ok(bytes)
=> Ok(bytes),
Expand Down
Loading

0 comments on commit 0214029

Please sign in to comment.