diff options
| author | lloyd <[email protected]> | 2015-05-12 02:08:37 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2015-05-12 02:08:37 +0000 |
| commit | 8965d79d362434f638369edc8fa62e77f2c40143 (patch) | |
| tree | 030b6de73f6c24f6a5229797eb34fb8410ac46cf | |
| parent | c06b6c1212cb16b2586fb6614dba984d1293db28 (diff) | |
The BUILD_MODE env var was not being passed through sudo by default
which broke coverage testing. Instead run the setup script as the
regular user and use sudo for specific commands, which seems cleaner
anyway.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | src/scripts/ci/setup.sh | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index f8e0e06df..2b533eb23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: - sudo apt-get update -qq install: - - sudo ./src/scripts/ci/setup.sh + - ./src/scripts/ci/setup.sh script: - ./src/scripts/ci/build.sh diff --git a/src/scripts/ci/setup.sh b/src/scripts/ci/setup.sh index 56643308a..85edf6a25 100755 --- a/src/scripts/ci/setup.sh +++ b/src/scripts/ci/setup.sh @@ -2,17 +2,17 @@ set -ev -apt-get install -y g++-4.8 -apt-get install -y libssl-dev -apt-get install -y libz-dev -apt-get install -y libsqlite3-dev -update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 -update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90 -update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.8 90 +sudo apt-get install -y g++-4.8 +sudo apt-get install -y libssl-dev +sudo apt-get install -y libz-dev +sudo apt-get install -y libsqlite3-dev +sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 +sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90 +sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.8 90 if [ "$BUILD_MODE" = "coverage" ]; then wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.11.orig.tar.gz tar -xvf lcov_1.11.orig.tar.gz - make -C lcov-1.11/ install + sudo make -C lcov-1.11/ install gem install coveralls-lcov fi |