Commit e523826c4ec2b7e8757f31490ba41005420d1c52
2017-10-07T01:38:53
Merge pull request #4321 from libgit2/ethomson/libcurl_build travis: add custom apt sources
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
diff --git a/.travis.yml b/.travis.yml
index 08289aa..1314345 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 15bac4d..0000000
--- 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