diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2017-10-07 00:10:06 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2017-10-07 00:10:06 +0100 |
| commit | 9dc21efdbf275dec18b9c34b472f8df9f8e8c169 (patch) | |
| tree | 22980513f7a0315d8a0aad287eed553df8520a3c | |
| parent | 62ac39314c11ec43e34e2930f990c3d4ad13153b (diff) | |
| download | libgit2-ethomson/libcurl_build.tar.gz | |
travis: add custom apt sourcesethomson/libcurl_build
Move back to Travis's VM infrastructure for efficiency.
| -rw-r--r-- | .travis.yml | 21 | ||||
| -rwxr-xr-x | script/install-deps-linux.sh | 12 |
2 files changed, 18 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 08289aaca..13143458f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ # see travis-ci.org for details language: c -dist: trusty os: - linux @@ -22,7 +21,23 @@ env: - OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON -DENABLE_WERROR=ON" dist: trusty -sudo: true +sudo: false + +addons: + apt: + sources: + - sourceline: 'deb http://libgit2deps.edwardthomson.com trusty libgit2deps' + key_url: 'https://pgp.mit.edu/pks/lookup?op=get&search=0x5656187599131CD5' + packages: + cmake + curl + libcurl3 + libcurl3-gnutls + libcurl4-gnutls-dev + libssh2-1-dev + openssh-client + openssh-server + valgrind matrix: fast_finish: true @@ -44,7 +59,7 @@ matrix: - env: COVERITY=1 install: - - ./script/install-deps-${TRAVIS_OS_NAME}.sh + - if [ -f ./script/install-deps-${TRAVIS_OS_NAME}.sh ]; then ./script/install-deps-${TRAVIS_OS_NAME}.sh; fi # Run the Build script and tests script: diff --git a/script/install-deps-linux.sh b/script/install-deps-linux.sh deleted file mode 100755 index 15bac4d08..000000000 --- a/script/install-deps-linux.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -x - -if [ -z "$PRECISE" ]; then - echo "deb http://libgit2deps.edwardthomson.com trusty libgit2deps" | sudo tee -a /etc/apt/sources.list - sudo apt-key adv --keyserver pgp.mit.edu --recv 99131CD5 - sudo apt-get update -qq - sudo apt-get install -y curl libcurl3 libcurl3-gnutls libcurl4-gnutls-dev -fi - -sudo apt-get install -y cmake libssh2-1-dev openssh-client openssh-server valgrind |