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

Update nightly version and upgrade futures dep (again) #924

Merged
merged 4 commits into from
Jan 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ _cargo_cache_template: &_cargo_cache_template
_windows_template: &_windows_template
os: windows
language: rust
rust: nightly-2018-12-26-x86_64-pc-windows-msvc
rust: nightly-2019-01-24-x86_64-pc-windows-msvc
before_install:
- choco install nodist
- PATH="/c/Program Files (x86)/Nodist/bin:$PATH"
Expand Down Expand Up @@ -68,14 +68,14 @@ _linux_nodejs_template: &_linux_nodejs_template
os: linux
dist: bionic
language: rust
rust: nightly-2018-12-26
rust: nightly-2019-01-24
before_script:
- . ./scripts/install/release-deps-ubuntu.sh

_macosx_nodejs_template: &_macosx_nodejs_template
os: osx
language: rust
rust: nightly-2018-12-26
rust: nightly-2019-01-24
before_script:
- . ./scripts/install/release-deps-osx.sh

Expand Down Expand Up @@ -136,7 +136,7 @@ _windows_nodejs_container_template: &_windows_nodejs_container_template
_cmd_deploy_template: &_cmd_deploy_template
dist: bionic
language: rust
rust: nightly-2018-12-26
rust: nightly-2019-01-24
if: tag =~ /^v\d+\.\d+\.\d+/
before_script:
- . ./scripts/install/release-deps-auto.sh
Expand All @@ -160,7 +160,7 @@ _cmd_deploy_template: &_cmd_deploy_template
_container_deploy_template: &_container_deploy_template
dist: bionic
language: rust
rust: nightly-2018-12-26
rust: nightly-2019-01-24
if: tag =~ /^v\d+\.\d+\.\d+/
before_script:
- . ./scripts/install/release-deps-auto.sh
Expand All @@ -183,7 +183,7 @@ _container_deploy_template: &_container_deploy_template
_windows_template_lite: &_windows_template_lite
os: windows
language: rust
rust: nightly-2018-12-26-x86_64-pc-windows-msvc
rust: nightly-2019-01-24-x86_64-pc-windows-msvc
before_install:
- CARGO_INCREMENTAL=1
- RUSTFLAGS="-Z thinlto -C codegen-units=16"
Expand Down Expand Up @@ -336,15 +336,15 @@ jobs:
- name: "CMD DEPLOY - 64 bit Windows MSVC"
<<: *_cmd_deploy_template
os: windows
rust: nightly-2018-12-26-x86_64-pc-windows-msvc
rust: nightly-2019-01-24-x86_64-pc-windows-msvc
env:
- TARGET=x86_64-pc-windows-msvc
- CRATE_NAME=hc

- name: "CMD DEPLOY - 64 bit Windows GNU"
<<: *_cmd_deploy_template
os: windows
rust: nightly-2018-12-26-x86_64-pc-windows-gnu
rust: nightly-2019-01-24-x86_64-pc-windows-gnu
env:
- TARGET=x86_64-pc-windows-gnu
- CRATE_NAME=hc
Expand All @@ -366,15 +366,15 @@ jobs:
- name: "CONTAINER DEPLOY - 64 bit Windows MSVC"
<<: *_container_deploy_template
os: windows
rust: nightly-2018-12-26-x86_64-pc-windows-msvc
rust: nightly-2019-01-24-x86_64-pc-windows-msvc
env:
- TARGET=x86_64-pc-windows-msvc
- CRATE_NAME=container

- name: "CONTAINER DEPLOY - 64 bit Windows GNU"
<<: *_container_deploy_template
os: windows
rust: nightly-2018-12-26-x86_64-pc-windows-gnu
rust: nightly-2019-01-24-x86_64-pc-windows-gnu
env:
- TARGET=x86_64-pc-windows-gnu
- CRATE_NAME=container
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Changed
- Capabilities now separated from function declarations in `define_zome!` and calling zome functions no longer uses capability name parameter [#791](https://github.com/holochain/holochain-rust/pull/779)
- Updated dependencies:
* Rust nightly to `2019-01-24`
* futures to `0.3.0-alpha.12`
### Added
- All structs/values to all HDK functions must implement `Into<JsonString>` and `TryFrom<JsonString>` (derive `DefaultJson` to do this automatically)
- HDK globals `AGENT_ADDRESS`, `AGENT_ID_STR`, `DNA_NAME` and `DNA_ADDRESS` are now set to real, correct values.
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ help:
@echo "run 'make test-something' to run cargo tests matching 'something'"

SHELL = /bin/bash
CORE_RUST_VERSION ?= nightly-2019-01-08
TOOLS_RUST_VERSION ?= nightly-2019-01-08
CORE_RUST_VERSION ?= nightly-2019-01-24
TOOLS_RUST_VERSION ?= nightly-2019-01-24
CARGO = RUSTFLAGS="-Z external-macro-backtrace -D warnings" RUST_BACKTRACE=1 rustup run $(CORE_RUST_VERSION) cargo $(CARGO_ARGS)
CARGO_TOOLS = RUSTFLAGS="-Z external-macro-backtrace -D warnings" RUST_BACKTRACE=1 rustup run $(TOOLS_RUST_VERSION) cargo $(CARGO_ARGS)
CARGO_TARPULIN_INSTALL = RUSTFLAGS="--cfg procmacro2_semver_exempt -D warnings" RUST_BACKTRACE=1 cargo $(CARGO_ARGS) +$(CORE_RUST_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ It is very important to be using the correct nightly version.

Currently this is:

`nightly-2019-01-08-x86_64-pc-windows-msvc`
`nightly-2019-01-24-x86_64-pc-windows-msvc`

The nightly version we test/develop against can always be found in the .travis.yml file.

Expand Down
10 changes: 5 additions & 5 deletions build.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cd container_api/wasm-test && cargo +nightly-2019-01-08 build --release --target wasm32-unknown-unknown && cd ../../
cd hdk-rust/wasm-test && cargo +nightly-2019-01-08 build --release --target wasm32-unknown-unknown && cd ../../
cd wasm_utils/wasm-test/integration-test && cargo +nightly-2019-01-08 build --release --target wasm32-unknown-unknown && cd ../../../
cd core/src/nucleus/actions/wasm-test && cargo +nightly-2019-01-08 build --release --target wasm32-unknown-unknown && cd ../../../../../
cargo +nightly-2019-01-08 build
cd container_api/wasm-test && cargo +nightly-2019-01-24 build --release --target wasm32-unknown-unknown && cd ../../
cd hdk-rust/wasm-test && cargo +nightly-2019-01-24 build --release --target wasm32-unknown-unknown && cd ../../
cd wasm_utils/wasm-test/integration-test && cargo +nightly-2019-01-24 build --release --target wasm32-unknown-unknown && cd ../../../
cd core/src/nucleus/actions/wasm-test && cargo +nightly-2019-01-24 build --release --target wasm32-unknown-unknown && cd ../../../../../
cargo +nightly-2019-01-24 build
12 changes: 6 additions & 6 deletions cmd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ apt-get install libzmq3-dev
These dependencies need to be installed in order to compile, and use `hc`:

- [Rust](https://www.rust-lang.org/en-US/install.html)
- needs to be the `nightly-2019-01-08` build, so use the following commands, once you have first installed Rust
- `rustup toolchain install nightly-2019-01-08`
- `rustup default nightly-2019-01-08`
- needs to be the `nightly-2019-01-24` build, so use the following commands, once you have first installed Rust
- `rustup toolchain install nightly-2019-01-24`
- `rustup default nightly-2019-01-24`
- (the specific nightly build we use will change over time)
- Also, if you are going to be developing Zomes in Rust, install the WASM build target for Rust, by running:
- `rustup target add wasm32-unknown-unknown --toolchain nightly`
Expand Down Expand Up @@ -166,9 +166,9 @@ The `package` command includes patterns inside `.gitignore` files automatically,
### Rust -> WASM compilation tools
If we take Zome code in Rust as an example, you will need Rust and Cargo set up appropriately to build WASM from Rust code. WASM compilation is available on the `nightly` Rust toolchain. To enable it, run the following:
```shell
$ rustup toolchain install nightly-2019-01-08
$ rustup target add wasm32-unknown-unknown --toolchain nightly-2019-01-08 # adds WASM as a compilation target
$ rustup override set nightly-2019-01-08 # switch to the nightly rust toolchain for the current project directory
$ rustup toolchain install nightly-2019-01-24
$ rustup target add wasm32-unknown-unknown --toolchain nightly-2019-01-24 # adds WASM as a compilation target
$ rustup override set nightly-2019-01-24 # switch to the nightly rust toolchain for the current project directory
```

Once that's done, you should be able to run commands like `cargo build --target=wasm32-unknown-unknown` and have it work.
Expand Down
8 changes: 4 additions & 4 deletions container/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ apt-get install libzmq3-dev
These dependencies need to be installed in order to compile, and use `holochain_container`:

- [Rust](https://www.rust-lang.org/en-US/install.html)
- needs to be the `nightly-2019-01-08` build, so use the following commands, once you have first installed Rust
- `rustup toolchain install nightly-2019-01-08`
- `rustup default nightly-2019-01-08`
- needs to be the `nightly-2019-01-24` build, so use the following commands, once you have first installed Rust
- `rustup toolchain install nightly-2019-01-24`
- `rustup default nightly-2019-01-24`
- Also, if you are going to be developing Zomes in Rust, install the WASM build target for Rust, by running:
- `rustup target add wasm32-unknown-unknown --toolchain nightly-2019-01-08`
- `rustup target add wasm32-unknown-unknown --toolchain nightly-2019-01-24`
- [Zmq](http://zeromq.org/intro:get-the-software)
- zeromq is a "distributed messaging" software package utilized in the networking stack of Holochain
- the link above has common platform installation instructions
Expand Down
14 changes: 7 additions & 7 deletions container_api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ holochain_core = { path = "../core" }
holochain_core_types = { path = "../core_types" }
holochain_net = { path = "../net" }
chrono = "0.4"
futures-preview = "=0.3.0-alpha.11"
futures-core-preview = "=0.3.0-alpha.11"
futures-channel-preview = "=0.3.0-alpha.11"
futures-executor-preview = "=0.3.0-alpha.11"
futures-io-preview = "=0.3.0-alpha.11"
futures-sink-preview = "=0.3.0-alpha.11"
futures-util-preview = "=0.3.0-alpha.11"
futures-preview = "=0.3.0-alpha.12"
futures-core-preview = "=0.3.0-alpha.12"
futures-channel-preview = "=0.3.0-alpha.12"
futures-executor-preview = "=0.3.0-alpha.12"
futures-io-preview = "=0.3.0-alpha.12"
futures-sink-preview = "=0.3.0-alpha.12"
futures-util-preview = "=0.3.0-alpha.12"
tempfile = "3"
serde = "1.0"
serde_derive = "1.0"
Expand Down
14 changes: 7 additions & 7 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ multihash = "0.8.0"
bitflags = "1.0"
holochain_wasm_utils = { path = "../wasm_utils"}
failure = "0.1.3"
futures-preview = "=0.3.0-alpha.11"
futures-core-preview = "=0.3.0-alpha.11"
futures-channel-preview = "=0.3.0-alpha.11"
futures-executor-preview = "=0.3.0-alpha.11"
futures-io-preview = "=0.3.0-alpha.11"
futures-sink-preview = "=0.3.0-alpha.11"
futures-util-preview = "=0.3.0-alpha.11"
futures-preview = "=0.3.0-alpha.12"
futures-core-preview = "=0.3.0-alpha.12"
futures-channel-preview = "=0.3.0-alpha.12"
futures-executor-preview = "=0.3.0-alpha.12"
futures-io-preview = "=0.3.0-alpha.12"
futures-sink-preview = "=0.3.0-alpha.12"
futures-util-preview = "=0.3.0-alpha.12"
lazy_static = "1.1.0"
unwrap_to = "0.1.0"
num-traits = "0.2"
Expand Down
14 changes: 7 additions & 7 deletions core_types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ serde = "1.0"
serde_derive = "1.0"
serde_json = { version = "1.0", features = ["preserve_order"] }
multihash = "0.8.0"
futures-preview = "=0.3.0-alpha.11"
futures-core-preview = "=0.3.0-alpha.11"
futures-channel-preview = "=0.3.0-alpha.11"
futures-executor-preview = "=0.3.0-alpha.11"
futures-io-preview = "=0.3.0-alpha.11"
futures-sink-preview = "=0.3.0-alpha.11"
futures-util-preview = "=0.3.0-alpha.11"
futures-preview = "=0.3.0-alpha.12"
futures-core-preview = "=0.3.0-alpha.12"
futures-channel-preview = "=0.3.0-alpha.12"
futures-executor-preview = "=0.3.0-alpha.12"
futures-io-preview = "=0.3.0-alpha.12"
futures-sink-preview = "=0.3.0-alpha.12"
futures-util-preview = "=0.3.0-alpha.12"

reed-solomon = "0.2.1"
rust-base58 = "0.0.4"
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ let
overlays = [ moz_overlay ];
};

date = "2019-01-08";
date = "2019-01-24";
wasmTarget = "wasm32-unknown-unknown";

rust-build = (nixpkgs.rustChannelOfTargets "nightly" date [ wasmTarget ]);
Expand Down