Merge pull request #205 from oh-my-fish/run-tests-on-osx

Run tests on osx

.travis.yml

@@ -1,7 +1,20 @@
+language: c
+dist: trusty
 sudo: required
-language: generic
+
-services:
+os:
-  - docker
+  - linux
+  - osx
+
+addons:
+  apt:
+    packages:
+    - bc
+    - doxygen
+    - expect
+    - gettext
+    - libncurses5-dev
+    - tree
 
 env:
   global:
@@ -10,19 +23,22 @@ env:
 
 before_install:
   - source tools/travis-github-pr-integration.sh
+  - tools/travis-install-fish.sh
 
 before_script:
-  - docker build --build-arg OMF_REPO_BRANCH=$OMF_REPO_BRANCH --build-arg OMF_REPO_URI=$OMF_REPO_URI -t oh-my-fish . < Dockerfile
+  - tree -h
-  - docker run -t oh-my-fish /usr/bin/fish -c "export; tree -h"
+  - export
+  - fish $TRAVIS_BUILD_DIR/bin/install
 
 script:
-  - docker run -t oh-my-fish /usr/bin/fish "tests/run.fish"
+  - tests/run.fish
-  - docker run -t oh-my-fish /usr/bin/fish -c "cd pkg/fish-spec; fish-spec"
+  - pushd pkg/fish-spec; fish -c 'fish-spec'; popd
-  - docker run -t oh-my-fish /usr/bin/fish -c "cd pkg/omf; fish-spec"
+  - pushd pkg/omf; fish -c 'fish-spec'; popd
-  - docker run -t oh-my-fish /usr/bin/fish "tests/test-generate-themes-doc.fish"
+  - tests/test-generate-themes-doc.fish
 
 after_failure:
-  - docker ps -a
+  - pwd
+  - cd ~/.config/fish; tree -h; find . -type f | xargs cat
 
 notifications:
   email:

tools/travis-install-fish.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -o pipefail
+set -o errexit
+set -o nounset
+#set -o xtrace
+
+# Return if we are not in a Pull Request
+if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
+  sudo apt-add-repository -y ppa:fish-shell/release-2
+  sudo apt-get update
+  sudo apt-get install -y fish
+else
+  brew update
+  brew install fish tree
+fi