From d53893b3461b37a55a86fe58f44752861cf0804e Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 8 Feb 2016 13:07:59 +0100 Subject: [PATCH 1/4] kcov uses travis_job_id instead of coveralls token --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 816e6d883..227853669 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 ] && From f532d76928c423a1253f2a335b537afe898005b2 Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 8 Feb 2016 13:34:01 +0100 Subject: [PATCH 2/4] trying to trigger travis build --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dc0498d26..87cc646fd 100644 --- a/README.md +++ b/README.md @@ -72,3 +72,4 @@ git clone https://github.com/ethcore/parity cd parity cargo build --release ``` + From 66685b2296234bc338d5148363c0433106d55034 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Mon, 8 Feb 2016 13:34:21 +0100 Subject: [PATCH 3/4] Don't use sudo for multirust. --- install-deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index e784f5b43..f76e2beaf 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -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 } From 69644d74c7dbebe7e5ab7808910a3967dc66d73b Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Mon, 8 Feb 2016 13:54:35 +0100 Subject: [PATCH 4/4] Install dev files for rocksdb. --- install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-deps.sh b/install-deps.sh index f76e2beaf..409f10d21 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -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()