Merge branch 'master' of github.com:ethcore/parity into jsonrpc
This commit is contained in:
commit
038f80437e
@ -42,7 +42,7 @@ after_success: |
|
||||
./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore-* &&
|
||||
./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethsync-* &&
|
||||
./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore_rpc-* &&
|
||||
./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${COVERALLS_TOKEN} --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/parity-* &&
|
||||
./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${TRAVIS_JOB_ID} --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/parity-* &&
|
||||
[ $TRAVIS_BRANCH = master ] &&
|
||||
[ $TRAVIS_PULL_REQUEST = false ] &&
|
||||
[ $TRAVIS_RUST_VERSION = nightly ] &&
|
||||
|
@ -74,3 +74,4 @@ git clone https://github.com/ethcore/parity
|
||||
cd parity
|
||||
cargo build --release
|
||||
```
|
||||
|
||||
|
@ -570,7 +570,7 @@ function run_installer()
|
||||
sudo apt-add-repository -y ppa:ethcore/ethcore
|
||||
sudo apt-get -f -y install
|
||||
sudo apt-get update -qq
|
||||
sudo apt-get install -qq -y librocksdb
|
||||
sudo apt-get install -qq -y librocksdb-dev
|
||||
}
|
||||
|
||||
function linux_rocksdb_installer()
|
||||
@ -628,8 +628,8 @@ function run_installer()
|
||||
|
||||
if [[ $isMultirustNightly == false ]]; then
|
||||
info "Installing rust nightly..."
|
||||
sudo multirust update nightly
|
||||
sudo multirust default nightly
|
||||
multirust update nightly
|
||||
multirust default nightly
|
||||
echo
|
||||
fi
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user