Enable Linux Container builds on travis.

libgit2 · Jun 26, 2015 · 39f6f9d · 39f6f9d
1 parent 18d84f0
commit 39f6f9d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,14 +16,24 @@ rvm:
   - ruby-head
   - rbx-2
 
+addons:
+  apt:
+    packages:
+    - cmake
+    - libssh2-1-dev
+    - openssh-client
+    - openssh-server
+
+sudo: false
+
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: rbx-2
     - rvm: ruby-head
 
 install:
-  - ./vendor/libgit2/script/install-deps-${TRAVIS_OS_NAME}.sh
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./vendor/libgit2/script/install-deps-osx.sh; fi
   - bundle install --deployment
 
 script: script/travisbuild
diff --git a/script/travisbuild b/script/travisbuild
@@ -5,8 +5,6 @@ mkdir $HOME/_temp
 git init --bare $HOME/_temp/test.git
 git daemon --listen=localhost --export-all --enable=receive-pack --base-path=$HOME/_temp $HOME/_temp 2>/dev/null &
 
-sudo start ssh
-
 ssh-keygen -t rsa -f ~/.ssh/rugged_test_rsa -N "" -q
 cat ~/.ssh/rugged_test_rsa.pub >>~/.ssh/authorized_keys
 ssh-keyscan -t rsa localhost >>~/.ssh/known_hosts