diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2017-07-26 23:23:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-26 23:23:37 +0100 |
| commit | 8f9d2bbf8384d1b8dbcb18d4c4f095da6ed85c80 (patch) | |
| tree | 8ddd0a8770ee145d87a3a3dcdfecd2d10b5a294f | |
| parent | 20d300007e17ab8191eed99b38cc09a643f57211 (diff) | |
| parent | c582fa4eb6bee7880f04080aa80357cca406e448 (diff) | |
| download | libgit2-8f9d2bbf8384d1b8dbcb18d4c4f095da6ed85c80.tar.gz | |
Merge pull request #4317 from libgit2/ethomson/libcurl_build
Build with patched libcurl
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rwxr-xr-x | script/cibuild.sh | 3 | ||||
| -rwxr-xr-x | script/install-deps-linux.sh | 12 |
3 files changed, 17 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index d789f15a7..a8e31a040 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ # see travis-ci.org for details language: c +dist: trusty os: - linux @@ -20,17 +21,8 @@ env: - OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release" - OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON" -addons: - apt: - packages: - - cmake - - libssh2-1-dev - - openssh-client - - openssh-server - - valgrind - dist: trusty -sudo: false +sudo: true matrix: fast_finish: true @@ -56,7 +48,7 @@ matrix: - env: COVERITY=1 install: - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./script/install-deps-${TRAVIS_OS_NAME}.sh; fi + - ./script/install-deps-${TRAVIS_OS_NAME}.sh # Run the Build script and tests script: diff --git a/script/cibuild.sh b/script/cibuild.sh index 9239136dd..74946db0a 100755 --- a/script/cibuild.sh +++ b/script/cibuild.sh @@ -50,6 +50,7 @@ cat >~/sshd/sshd_config<<-EOF ListenAddress 0.0.0.0 Protocol 2 HostKey ${HOME}/sshd/id_rsa + PidFile ${HOME}/sshd/pid RSAAuthentication yes PasswordAuthentication yes PubkeyAuthentication yes @@ -99,7 +100,7 @@ if [ -e ./libgit2_clar ]; then fi -killall sshd +kill $(cat "$HOME/sshd/pid") export GITTEST_REMOTE_URL="https://github.com/libgit2/non-existent" export GITTEST_REMOTE_USER="libgit2test" diff --git a/script/install-deps-linux.sh b/script/install-deps-linux.sh new file mode 100755 index 000000000..15bac4d08 --- /dev/null +++ b/script/install-deps-linux.sh @@ -0,0 +1,12 @@ +#!/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 |