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

Commit

Permalink
use same rust version everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
thedavidmeister committed Dec 15, 2018
1 parent 9911336 commit 09b2e31
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 38 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Expand Up @@ -35,7 +35,7 @@ _cargo_cache_template: &_cargo_cache_template
_windows_template: &_windows_template
os: windows
language: rust
rust: nightly-2018-10-12-x86_64-pc-windows-msvc
rust: nightly-2018-11-28-x86_64-pc-windows-msvc
before_install:
- choco install nodist
- PATH="/c/Program Files (x86)/Nodist/bin:$PATH"
Expand Down Expand Up @@ -67,12 +67,12 @@ _unix_nodejs_container_template: &_unix_nodejs_container_template
_linux_nodejs_template: &_linux_nodejs_template
os: linux
language: rust
rust: nightly
rust: nightly-2018-11-28

_macosx_nodejs_template: &_macosx_nodejs_template
os: osx
language: rust
rust: nightly
rust: nightly-2018-11-28

_to_deploy_template: &_to_deploy_template
if: tag =~ /^holochain-nodejs-v\d+\.\d+\.\d+/
Expand Down Expand Up @@ -130,7 +130,7 @@ _windows_nodejs_container_template: &_windows_nodejs_container_template
# holochain-cmd deploy template
_cmd_deploy_template: &_cmd_deploy_template
language: rust
rust: nightly-2018-10-12
rust: nightly-2018-11-28
if: tag =~ /^holochain-cmd-v\d+\.\d+\.\d+/
before_script:
- make install_system_libzmq
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
- name: "CMD DEPLOY - 64 bit Windows MSVC"
<<: *_cmd_deploy_template
os: windows
rust: nightly-2018-10-12-x86_64-pc-windows-msvc
rust: nightly-2018-11-28-x86_64-pc-windows-msvc
env:
- TARGET=x86_64-pc-windows-msvc
- CRATE_NAME=hc
Expand All @@ -224,7 +224,7 @@ jobs:
- name: "CMD DEPLOY - 64 bit Windows GNU"
<<: *_cmd_deploy_template
os: windows
rust: nightly-2018-10-12-x86_64-pc-windows-gnu
rust: nightly-2018-11-28-x86_64-pc-windows-gnu
env:
- TARGET=x86_64-pc-windows-gnu
- CRATE_NAME=hc
Expand Down
10 changes: 5 additions & 5 deletions build.bat
@@ -1,5 +1,5 @@
cd container_api/wasm-test && cargo +nightly-2018-10-12 build --release --target wasm32-unknown-unknown && cd ../../
cd hdk-rust/wasm-test && cargo +nightly-2018-10-12 build --release --target wasm32-unknown-unknown && cd ../../
cd wasm_utils/wasm-test/integration-test && cargo +nightly-2018-10-12 build --release --target wasm32-unknown-unknown && cd ../../../
cd core/src/nucleus/actions/wasm-test && cargo +nightly-2018-10-12 build --release --target wasm32-unknown-unknown && cd ../../../../../
cargo +nightly-2018-10-12 build
cd container_api/wasm-test && cargo +nightly-2018-11-28 build --release --target wasm32-unknown-unknown && cd ../../
cd hdk-rust/wasm-test && cargo +nightly-2018-11-28 build --release --target wasm32-unknown-unknown && cd ../../
cd wasm_utils/wasm-test/integration-test && cargo +nightly-2018-11-28 build --release --target wasm32-unknown-unknown && cd ../../../
cd core/src/nucleus/actions/wasm-test && cargo +nightly-2018-11-28 build --release --target wasm32-unknown-unknown && cd ../../../../../
cargo +nightly-2018-11-28 build
23 changes: 0 additions & 23 deletions docker/Dockerfile.alpine

This file was deleted.

4 changes: 2 additions & 2 deletions docker/Makefile
Expand Up @@ -9,8 +9,8 @@

all: lint build_holochain build_cmd

CORE_RUST_VERSION ?= nightly-2018-10-12
TOOLS_RUST_VERSION ?= nightly-2018-07-17
CORE_RUST_VERSION ?= nightly-2018-11-28
TOOLS_RUST_VERSION ?= nightly-2018-11-28
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 = RUSTFLAGS="--cfg procmacro2_semver_exempt -Z external-macro-backtrace -D warnings" RUST_BACKTRACE=1 cargo $(CARGO_ARGS) +$(CORE_RUST_VERSION)
Expand Down
2 changes: 0 additions & 2 deletions docker/build-alpine

This file was deleted.

0 comments on commit 09b2e31

Please sign in to comment.