From 6dc77308a2f187a9a0209898535109605131f399 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 20 Sep 2023 16:28:02 -0600 Subject: [PATCH 1/3] remove lockfile check --- .github/workflows/check-offline.yaml | 30 ---------------------------- 1 file changed, 30 deletions(-) delete mode 100644 .github/workflows/check-offline.yaml diff --git a/.github/workflows/check-offline.yaml b/.github/workflows/check-offline.yaml deleted file mode 100644 index 7d116b091..000000000 --- a/.github/workflows/check-offline.yaml +++ /dev/null @@ -1,30 +0,0 @@ -name: "check-lockfile" -on: - # Trigger the workflow on push or pull request, - # but only for the main branch - push: - branches: [ main, develop, holochain-0.1, holochain-0.2 ] - pull_request: - branches: [ main, develop, holochain-0.1, holochain-0.2 ] - -jobs: - check-lockfile: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Install nix - uses: cachix/install-nix-action@v18 - with: - install_url: https://releases.nixos.org/nix/nix-2.12.0/install - extra_nix_config: | - experimental-features = flakes nix-command - - - uses: cachix/cachix-action@v10 - with: - name: holochain-ci - - - name: Install - run: | - nix develop --command bash -c "cargo build --locked" - From d95650783eba92b3fd9aaf0fd2fac4c524737dd4 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 20 Sep 2023 16:45:06 -0600 Subject: [PATCH 2/3] Remove duplicate extend-space --- .github/actions/extend-space/action.yaml | 1 - .github/workflows/test.yaml | 3 --- 2 files changed, 4 deletions(-) diff --git a/.github/actions/extend-space/action.yaml b/.github/actions/extend-space/action.yaml index 67ccc0cb7..36b34f48d 100644 --- a/.github/actions/extend-space/action.yaml +++ b/.github/actions/extend-space/action.yaml @@ -1,6 +1,5 @@ # Extends disk space on github hosted runners - name: "Extend space" description: "Teases out as much free space as possible" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c5a7148cd..d535b2d3a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,9 +13,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Extend space - uses: ./.github/actions/extend-space - - name: Extend space uses: ./.github/actions/extend-space From f12dab7f5b08db8e6f0b591e0c6404142eaa24ac Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 25 Sep 2023 12:07:36 -0600 Subject: [PATCH 3/3] fix hello world template --- templates/vanilla/example/Cargo.toml.hbs | 7 ++++--- .../zomes/coordinator/hello_world/src/lib.rs.hbs | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/templates/vanilla/example/Cargo.toml.hbs b/templates/vanilla/example/Cargo.toml.hbs index a328b406d..358ee0854 100644 --- a/templates/vanilla/example/Cargo.toml.hbs +++ b/templates/vanilla/example/Cargo.toml.hbs @@ -8,9 +8,10 @@ opt-level = "z" members = ["dnas/*/zomes/coordinator/*", "dnas/*/zomes/integrity/*"] [workspace.dependencies] -hdi = "=0.2.1" -hdk = "=0.1.1" -serde = "1" +hdi = "=0.3.1" +hdk = "=0.2.1" +holochain_integrity_types = "=0.1.2" +serde = "=1.0.166" [workspace.dependencies.hello_world] path = "dnas/hello_world/zomes/coordinator/hello_world" diff --git a/templates/vanilla/example/dnas/hello_world/zomes/coordinator/hello_world/src/lib.rs.hbs b/templates/vanilla/example/dnas/hello_world/zomes/coordinator/hello_world/src/lib.rs.hbs index 03fd3e35b..5797591dd 100644 --- a/templates/vanilla/example/dnas/hello_world/zomes/coordinator/hello_world/src/lib.rs.hbs +++ b/templates/vanilla/example/dnas/hello_world/zomes/coordinator/hello_world/src/lib.rs.hbs @@ -32,11 +32,11 @@ pub fn get_hellos(_: ()) -> ExternResult> { let links = get_links(path.path_entry_hash()?, LinkTypes::AllHellos, None)?; let get_input: Vec = links .into_iter() - .map(|link| GetInput::new( - ActionHash::from(link.target).into(), + .map(|link| Ok(GetInput::new( + link.target.into_action_hash().ok_or(wasm_error!(WasmErrorInner::Guest(String::from("No action hash associated with link"))))?.into(), GetOptions::default(), - )) - .collect(); + ))) + .collect::>>()?; // load the records for all the links let records = HDK.with(|hdk| hdk.borrow().get(get_input))?;