grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:ethcore/parity into jsonrpc

Browse Source
This commit is contained in:
debris 2016-02-08 14:15:06 +01:00
commit 038f80437e
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -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/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/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 --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_BRANCH = master ] &&
[ $TRAVIS_PULL_REQUEST = false ] && [ $TRAVIS_PULL_REQUEST = false ] &&
[ $TRAVIS_RUST_VERSION = nightly ] && [ $TRAVIS_RUST_VERSION = nightly ] &&

1
README.md
View File

@ -74,3 +74,4 @@ git clone https://github.com/ethcore/parity
cd parity cd parity
cargo build --release cargo build --release
``` ```

6
install-deps.sh
View File

@ -570,7 +570,7 @@ function run_installer()
sudo apt-add-repository -y ppa:ethcore/ethcore sudo apt-add-repository -y ppa:ethcore/ethcore
sudo apt-get -f -y install sudo apt-get -f -y install
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -qq -y librocksdb sudo apt-get install -qq -y librocksdb-dev
} }
function linux_rocksdb_installer() function linux_rocksdb_installer()
@ -628,8 +628,8 @@ function run_installer()
if [[ $isMultirustNightly == false ]]; then if [[ $isMultirustNightly == false ]]; then
info "Installing rust nightly..." info "Installing rust nightly..."
sudo multirust update nightly multirust update nightly
sudo multirust default nightly multirust default nightly
echo echo
fi fi
} }