Skip to content
This repository has been archived by the owner on Feb 3, 2023. It is now read-only.

Commit

Permalink
Merge pull request #1220 from holochain/release-0.0.10-alpha2
Browse files Browse the repository at this point in the history
Release 0.0.10-alpha2
  • Loading branch information
thedavidmeister committed Apr 4, 2019
2 parents 7951e54 + d7bc3a3 commit e9429a6
Show file tree
Hide file tree
Showing 41 changed files with 82 additions and 68 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ jobs:
resource_class: xlarge
steps:
- checkout
- run: . ./scripts/install/auto.sh
- run: ./scripts/install/auto.sh
- run: make test

# https://github.com/NixOS/nix/issues/1559
Expand All @@ -172,7 +172,7 @@ jobs:
resource_class: xlarge
steps:
- checkout
- run: . ./scripts/install/auto.sh
- run: ./scripts/install/auto.sh
- run: make test

# https://github.com/NixOS/nix/issues/1559
Expand All @@ -196,7 +196,7 @@ jobs:
resource_class: xlarge
steps:
- checkout
- run: . ./scripts/install/auto.sh
- run: ./scripts/install/auto.sh
- run: make test

# https://github.com/NixOS/nix/issues/1559
Expand All @@ -219,7 +219,7 @@ jobs:
xcode: "10.2.0"
steps:
- checkout
- run: . ./scripts/install/auto.sh
- run: ./scripts/install/auto.sh
- run: make test

cold.mac.10.nix:
Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ _linux_nodejs_template: &_linux_nodejs_template
language: rust
rust: nightly-2019-01-24
before_install:
- . ./scripts/install/auto.sh
- ./scripts/install/auto.sh

_macosx_nodejs_template: &_macosx_nodejs_template
os: osx
language: rust
rust: nightly-2019-01-24
before_install:
- . ./scripts/install/auto.sh
- ./scripts/install/auto.sh

_to_deploy_template: &_to_deploy_template
if: tag =~ /^holochain-nodejs-v\d+\.\d+\.\d+-alpha\d+/
Expand Down Expand Up @@ -136,7 +136,7 @@ _cli_deploy_template: &_cli_deploy_template
rust: nightly-2019-01-24
if: tag =~ /^v\d+\.\d+\.\d+-alpha\d+/
before_script:
- . ./scripts/install/auto.sh
- ./scripts/install/auto.sh
script:
- cargo rustc --manifest-path cli/Cargo.toml --target $TARGET --release -- -C lto
- mkdir cli-$TRAVIS_TAG-$TARGET
Expand All @@ -160,7 +160,7 @@ _conductor_deploy_template: &_conductor_deploy_template
rust: nightly-2019-01-24
if: tag =~ /^v\d+\.\d+\.\d+-alpha\d+/
before_script:
- . ./scripts/install/auto.sh
- ./scripts/install/auto.sh
script:
- cargo rustc --manifest-path conductor/Cargo.toml --target $TARGET --release -- -C lto
- mkdir conductor-$TRAVIS_TAG-$TARGET
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Security

## [0.0.10-alpha2] - 2019-04-04

### Added

### Changed

### Deprecated

### Removed

### Fixed

### Security

## [0.0.10-alpha1] - 2019-04-04

### Added
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ For Linux/OSX you can install the prerequisites directly into the host environme

``` shell
cd path/to/holochain
. ./scripts/install/auto.sh
./scripts/install/auto.sh
```

**Note**: the script will install [homebrew](https://brew.sh/) on mac os x
Expand Down
2 changes: 1 addition & 1 deletion app_spec/zomes/blog/code/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "code"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion app_spec/zomes/summer/code/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "code"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "benchmarks"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion cas_implementations/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "holochain_cas_implementations"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hc"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ $ cargo install hc --force --git https://github.com/holochain/holochain-rust.git

To install the latest released version of the Holochain conductor, run the following command in a terminal
```shell
$ cargo install hc --force --git https://github.com/holochain/holochain-rust.git --tag v0.0.10-alpha1
$ cargo install hc --force --git https://github.com/holochain/holochain-rust.git --tag v0.0.10-alpha2
```

The command line tools are now available in your command line using the `hc` command.
Expand Down
2 changes: 1 addition & 1 deletion cli/src/cli/js-tests-scaffold/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"@holochain/holochain-nodejs": "0.4.9-alpha1",
"@holochain/holochain-nodejs": "0.4.9-alpha2",
"json3": "*",
"tape": "^4.9.1"
}
Expand Down
2 changes: 1 addition & 1 deletion cli/src/cli/scaffold/rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fn generate_cargo_toml(name: &str, contents: &str) -> DefaultResult<String> {
let version_default = if maybe_version.is_some() {
maybe_version.unwrap()
} else {
String::from("tag = \"v0.0.10-alpha1\"")
String::from("tag = \"v0.0.10-alpha2\"")
};
let maybe_package = config.get("package");

Expand Down
2 changes: 1 addition & 1 deletion cli/src/cli/scaffold/rust/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use hdk::holochain_core_types::{
validation::EntryValidationData
};

// see https://developer.holochain.org/api/0.0.10-alpha1/hdk/ for info on using the hdk library
// see https://developer.holochain.org/api/0.0.10-alpha2/hdk/ for info on using the hdk library

// This is a sample zome that defines an entry type "MyEntry" that can be committed to the
// agent's chain via the exposed function create_my_entry
Expand Down
2 changes: 1 addition & 1 deletion common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "holochain_common"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion conductor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "holochain"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion conductor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ $ cargo install holochain --force --git https://github.com/holochain/holochain-r

To install the latest released version of the Holochain conductor, run the following command in a terminal
```shell
$ cargo install holochain --force --git https://github.com/holochain/holochain-rust.git --tag v0.0.10-alpha1
$ cargo install holochain --force --git https://github.com/holochain/holochain-rust.git --tag v0.0.10-alpha2
```

The Conductor should then be available from your command line using the `holochain` command.
Expand Down
2 changes: 1 addition & 1 deletion conductor_api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "holochain_conductor_api"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion conductor_api/test-bridge-caller/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test-bridge-caller"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion conductor_api/wasm-test/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "example_api_wasm"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "holochain_core"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion core/src/nucleus/actions/wasm-test/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nucleus-actions-tests"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion core_api_c_binding/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "holochain_core_api_c_binding"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion core_types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "holochain_core_types"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
build = "build.rs"

Expand Down
2 changes: 1 addition & 1 deletion core_types_derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "holochain_core_types_derive"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion dna_c_binding/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "holochain_dna_c_binding"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]

[lib]
Expand Down
30 changes: 13 additions & 17 deletions doc/holochain_101/src/first_steps.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# First steps writing Holochain hApps with Rust

___
This tutorial builds for the 0.0.7-alpha release but as the API and HDK are changing it will likely fail under newer releases.
This tutorial builds for the 0.0.9-alpha release but as the API and HDK are changing it will likely fail under newer releases.
___

Holochain hApps are made of compiled WebAssembly that encodes the rules of the hApp, the data it can store and how users will interact with it. This means that [any language that can compile to WebAssembly](https://github.com/appcypher/awesome-wasm-langs) can one day be used for Holochain.
Expand Down Expand Up @@ -64,7 +64,7 @@ The project structure should now be as follows:
```

## Writing the lists zome
The Rust HDK makes use of Rust macros to reduce the need for boilerplate code. The most important of which is the [`define_zome!`](https://developer.holochain.org/api/0.0.7-alpha/hdk/macro.define_zome.html) macro. Every zome must use this to define the structure of the zome, what entries it contains, which functions it exposes and what to do on first start-up (genesis).
The Rust HDK makes use of Rust macros to reduce the need for boilerplate code. The most important of which is the [`define_zome!`](https://developer.holochain.org/api/0.0.9-alpha/hdk/macro.define_zome.html) macro. Every zome must use this to define the structure of the zome, what entries it contains, which functions it exposes and what to do on first start-up (genesis).

Open up `lib.rs` and replace its contents with the following:

Expand Down Expand Up @@ -94,12 +94,12 @@ This is the simplest possible zome with no entries and no exposed functions.
Unlike in holochain-proto, where you needed to define a JSON schema to validate entries, holochain entries in Rust map to a native struct type. We can define our list and listItem structs as follows:

```rust
#[derive(Serialize, Deserialize, Debug, DefaultJson)]
#[derive(Serialize, Deserialize, Debug, Clone, DefaultJson)]
struct List {
name: String
}

#[derive(Serialize, Deserialize, Debug, DefaultJson)]
#[derive(Serialize, Deserialize, Debug, Clone, DefaultJson)]
struct ListItem {
text: String,
completed: bool
Expand Down Expand Up @@ -151,17 +151,16 @@ define_zome! {
name: "list",
description: "",
sharing: Sharing::Public,
native_type: List,
validation_package: || hdk::ValidationPackageDefinition::Entry,
validation: |list: List, _ctx: hdk::ValidationData| {
validation: |validation_data: hdk::EntryValidationData<List>| {
Ok(())
},
links: [
to!(
"listItem",
tag: "items",
validation_package: || hdk::ValidationPackageDefinition::Entry,
validation: |base: Address, target: Address, _ctx: hdk::ValidationData| {
validation: |_validation_data: hdk::LinkValidationData| {
Ok(())
}
)
Expand All @@ -171,9 +170,8 @@ define_zome! {
name: "listItem",
description: "",
sharing: Sharing::Public,
native_type: ListItem,
validation_package: || hdk::ValidationPackageDefinition::Entry,
validation: |list_item: ListItem, _ctx: hdk::ValidationData| {
validation: |validation_data: hdk::EntryValidationData<ListItem>| {
Ok(())
}
)
Expand Down Expand Up @@ -311,17 +309,16 @@ define_zome! {
name: "list",
description: "",
sharing: Sharing::Public,
native_type: List,
validation_package: || hdk::ValidationPackageDefinition::Entry,
validation: |list: List, _ctx: hdk::ValidationData| {
validation: |validation_data: hdk::EntryValidationData<List>| {
Ok(())
},
links: [
to!(
"listItem",
tag: "items",
validation_package: || hdk::ValidationPackageDefinition::Entry,
validation: |base: Address, target: Address, _ctx: hdk::ValidationData| {
validation: |_validation_data: hdk::LinkValidationData| {
Ok(())
}
)
Expand All @@ -331,9 +328,8 @@ define_zome! {
name: "listItem",
description: "",
sharing: Sharing::Public,
native_type: ListItem,
validation_package: || hdk::ValidationPackageDefinition::Entry,
validation: |list_item: ListItem, _ctx: hdk::ValidationData| {
validation: |validation_data: hdk::EntryValidationData<ListItem>| {
Ok(())
}
)
Expand Down Expand Up @@ -366,12 +362,12 @@ define_zome! {
}


#[derive(Serialize, Deserialize, Debug, DefaultJson)]
#[derive(Serialize, Deserialize, Debug, Clone, DefaultJson)]
struct List {
name: String
}

#[derive(Serialize, Deserialize, Debug, DefaultJson)]
#[derive(Serialize, Deserialize, Debug, Clone, DefaultJson)]
struct ListItem {
text: String,
completed: bool
Expand Down Expand Up @@ -521,4 +517,4 @@ Pro tip: [Pipe the output to tap-spec](https://github.com/scottcorgan/tap-spec)

And there we have it! A simple Zome created with Holochain using the Rust HDK.

The [complete working version of this project is available on github](https://github.com/willemolding/holochain-rust-todo). This builds under the 0.0.7-alpha release but as the API and HDK are changing it will likely fail under newer releases.
The [complete working version of this project is available on github](https://github.com/willemolding/holochain-rust-todo). This builds under the 0.0.9-alpha release but as the API and HDK are changing it will likely fail under newer releases.
2 changes: 1 addition & 1 deletion dpki/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "holochain_dpki"
version = "0.0.10-alpha1"
version = "0.0.10-alpha2"
authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
edition = "2018"

Expand Down
Loading

0 comments on commit e9429a6

Please sign in to comment.