diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2017-06-21 12:25:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-21 12:25:26 +0200 |
commit | 62c44c493ac84c4b6ec4fdc171af70e43be7b847 (patch) | |
tree | 95b3d9417969e3ecb964edbf7c7794fda1a6dfad | |
parent | 77850789d1cdfe8de987b1b6927000398e527bc9 (diff) | |
parent | 7c8d460f8410cf7a110eb10e9c4bafdede6a49c6 (diff) | |
download | libgit2-62c44c493ac84c4b6ec4fdc171af70e43be7b847.tar.gz |
Merge pull request #4211 from pks-t/pks/trusty
travis: upgrade container to Ubuntu 14.04
-rw-r--r-- | .travis.yml | 7 | ||||
-rwxr-xr-x | script/cibuild.sh | 34 | ||||
-rw-r--r-- | tests/online/clone.c | 2 |
3 files changed, 34 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index af38252ce..d789f15a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ addons: - openssh-server - valgrind +dist: trusty sudo: false matrix: @@ -38,13 +39,19 @@ matrix: compiler: gcc include: - compiler: gcc + env: PRECISE=1 + os: linux + dist: precise + - compiler: gcc env: COVERITY=1 os: linux + dist: trusty - compiler: gcc env: - VALGRIND=1 OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DDEBUG_POOL=ON -DCMAKE_BUILD_TYPE=Debug" os: linux + dist: trusty allow_failures: - env: COVERITY=1 diff --git a/script/cibuild.sh b/script/cibuild.sh index 403df223e..9239136dd 100755 --- a/script/cibuild.sh +++ b/script/cibuild.sh @@ -43,23 +43,39 @@ ctest -V -R libgit2_clar || exit $? killall git-daemon -if [ "$TRAVIS_OS_NAME" = "osx" ]; then - echo 'PasswordAuthentication yes' | sudo tee -a /etc/sshd_config -fi - +# Set up sshd +mkdir ~/sshd/ +cat >~/sshd/sshd_config<<-EOF + Port 2222 + ListenAddress 0.0.0.0 + Protocol 2 + HostKey ${HOME}/sshd/id_rsa + RSAAuthentication yes + PasswordAuthentication yes + PubkeyAuthentication yes + ChallengeResponseAuthentication no + # Required here as sshd will simply close connection otherwise + UsePAM no +EOF +ssh-keygen -t rsa -f ~/sshd/id_rsa -N "" -q +/usr/sbin/sshd -f ~/sshd/sshd_config + +# Set up keys ssh-keygen -t rsa -f ~/.ssh/id_rsa -N "" -q cat ~/.ssh/id_rsa.pub >>~/.ssh/authorized_keys -ssh-keyscan -t rsa localhost >>~/.ssh/known_hosts +while read algorithm key comment; do + echo "[localhost]:2222 $algorithm $key" >>~/.ssh/known_hosts +done <~/sshd/id_rsa.pub # Get the fingerprint for localhost and remove the colons so we can parse it as # a hex number. The Mac version is newer so it has a different output format. if [ "$TRAVIS_OS_NAME" = "osx" ]; then - export GITTEST_REMOTE_SSH_FINGERPRINT=$(ssh-keygen -E md5 -F localhost -l | tail -n 1 | cut -d ' ' -f 3 | cut -d : -f2- | tr -d :) + export GITTEST_REMOTE_SSH_FINGERPRINT=$(ssh-keygen -E md5 -F '[localhost]:2222' -l | tail -n 1 | cut -d ' ' -f 3 | cut -d : -f2- | tr -d :) else - export GITTEST_REMOTE_SSH_FINGERPRINT=$(ssh-keygen -F localhost -l | tail -n 1 | cut -d ' ' -f 2 | tr -d ':') + export GITTEST_REMOTE_SSH_FINGERPRINT=$(ssh-keygen -F '[localhost]:2222' -l | tail -n 1 | cut -d ' ' -f 2 | tr -d ':') fi -export GITTEST_REMOTE_URL="ssh://localhost/$HOME/_temp/test.git" +export GITTEST_REMOTE_URL="ssh://localhost:2222/$HOME/_temp/test.git" export GITTEST_REMOTE_USER=$USER export GITTEST_REMOTE_SSH_KEY="$HOME/.ssh/id_rsa" export GITTEST_REMOTE_SSH_PUBKEY="$HOME/.ssh/id_rsa.pub" @@ -83,6 +99,8 @@ if [ -e ./libgit2_clar ]; then fi +killall sshd + export GITTEST_REMOTE_URL="https://github.com/libgit2/non-existent" export GITTEST_REMOTE_USER="libgit2test" ctest -V -R libgit2_clar-cred_callback diff --git a/tests/online/clone.c b/tests/online/clone.c index 04fd22d45..5eda73f87 100644 --- a/tests/online/clone.c +++ b/tests/online/clone.c @@ -547,7 +547,7 @@ void test_online_clone__ssh_cert(void) if (!_remote_ssh_fingerprint) cl_skip(); - cl_git_fail_with(GIT_EUSER, git_clone(&g_repo, "ssh://localhost/foo", "./foo", &g_options)); + cl_git_fail_with(GIT_EUSER, git_clone(&g_repo, _remote_url, "./foo", &g_options)); } static char *read_key_file(const char *path) |