Merge branch 'master' of github.com:gavofyork/ethcore-util

This commit is contained in:
Gav Wood 2015-11-29 01:40:00 +01:00
commit 591bc3ef00
1 changed files with 21 additions and 14 deletions

View File

@ -4,23 +4,30 @@ rust:
- 1.4.0 - 1.4.0
os: os:
- linux #- linux
#- osx - osx
before_script: before_script:
# g++4.8 for C++11 which is required by rocksdb # g++4.8 for C++11 which is required by rocksdb
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test #- if [ $TRAVIS_OS_NAME == "linux" ]; then
- sudo apt-get update -y -qq #sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get install -qq --yes --force-yes g++-4.8 #sudo apt-get update -y -qq
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50 #sudo apt-get install -qq --yes --force-yes g++-4.8
#sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
- wget https://github.com/facebook/rocksdb/archive/rocksdb-3.13.tar.gz #wget https://github.com/facebook/rocksdb/archive/rocksdb-3.13.tar.gz
- tar xvf rocksdb-3.13.tar.gz && cd rocksdb-rocksdb-3.13 && make shared_lib #tar xvf rocksdb-3.13.tar.gz && cd rocksdb-rocksdb-3.13 && make shared_lib
- sudo make install #sudo make install
- cd .. #cd ..
#else
- brew update
- brew install rocksdb
#fi
after_success: after_success:
- sudo apt-get install libcurl4-openssl-dev libelf-dev libdw-dev #- if [ $TRAVIS_OS_NAME == "linux" ]; then
- wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz #sudo apt-get install libcurl4-openssl-dev libelf-dev libdw-dev
- tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && sudo make install && cd ../.. && #wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz
- kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov target/debug/ethcore_util-* #tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && sudo make install && cd ../.. &&
#kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov target/debug/ethcore_util-*
#fi