summaryrefslogtreecommitdiff
path: root/script/cibuild.sh
diff options
context:
space:
mode:
authorVicent Marti <vicent@github.com>2014-08-26 17:48:06 +0200
committerVicent Marti <vicent@github.com>2014-08-26 17:48:06 +0200
commit94f74ad28f191e7dc17ae874c00e3ecd6a80fcf4 (patch)
tree3128f3eac456486814fdbc5529e44e127316c519 /script/cibuild.sh
parent1589aa0c4d48fb130d8a5db28c45cd3d173cde6d (diff)
parent8733993599d9d9a8fe1b042a1e18d6ecb9b0a0b2 (diff)
downloadlibgit2-94f74ad28f191e7dc17ae874c00e3ecd6a80fcf4.tar.gz
Merge pull request #2422 from libgit2/cmn/ssh-retry
Enable retries for SSH
Diffstat (limited to 'script/cibuild.sh')
-rwxr-xr-xscript/cibuild.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/script/cibuild.sh b/script/cibuild.sh
index 699404bd2..ef2ac6e8e 100755
--- a/script/cibuild.sh
+++ b/script/cibuild.sh
@@ -22,7 +22,13 @@ ctest -V . || exit $?
# can do the push tests over it
killall git-daemon
-sudo start ssh
+
+if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+ echo 'PasswordAuthentication yes' | sudo tee -a /etc/sshd_config
+else
+ sudo start ssh
+fi
+
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
@@ -34,5 +40,5 @@ export GITTEST_REMOTE_SSH_PUBKEY="$HOME/.ssh/id_rsa.pub"
export GITTEST_REMOTE_SSH_PASSPHRASE=""
if [ -e ./libgit2_clar ]; then
- ./libgit2_clar -sonline::push -sonline::clone::cred_callback_failure
+ ./libgit2_clar -sonline::push -sonline::clone::cred_callback
fi