Skip to content

Commit

Permalink
Merge pull request #218 from AurevoirXavier/try
Browse files Browse the repository at this point in the history
Upgrade to Substrate 2.0
  • Loading branch information
yanganto authored Feb 10, 2020
2 parents 1404ef3 + d078862 commit f403705
Show file tree
Hide file tree
Showing 136 changed files with 16,353 additions and 23,476 deletions.
File renamed without changes.
File renamed without changes.
13 changes: 4 additions & 9 deletions ci/script.sh → .maintain/ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,28 @@

set -eux

# Install rustup and the specified rust toolchain.
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=$RUST_TOOLCHAIN -y

# Load cargo environment. Specifically, put cargo into PATH.
source ~/.cargo/env

# Install wasm toolchain
rustup target add wasm32-unknown-unknown

rustup --version
cargo --version
rustc --version

case $TARGET in
# Format check
"rustfmt")
sudo apt-get -y update
sudo apt-get install -y cmake pkg-config libssl-dev
cargo fmt --all
;;

# Unit test
"native")
# Unit test
cargo test --release --all --locked "$@"
;;

# Build test
"wasm")
# Build test
rustup target add wasm32-unknown-unknown
cargo build --locked "$@"
;;
esac
File renamed without changes.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
global:
- RUST_BACKTRACE=1
matrix:
- RUST_TOOLCHAIN=nightly TARGET=rustfmt
- RUST_TOOLCHAIN=stable TARGET=rustfmt
- RUST_TOOLCHAIN=nightly TARGET=wasm
- RUST_TOOLCHAIN=nightly TARGET=native

Expand All @@ -23,7 +23,7 @@ before_install:
- df -h

script:
- ./ci/script.sh
- .maintain/ci/script.sh

after_script:
# Check how much free disk space left after the build
Expand Down
62 changes: 0 additions & 62 deletions CONTRIBUTING.adoc

This file was deleted.

Loading

0 comments on commit f403705

Please sign in to comment.