Merge pull request #22 from michaelcontento/travis-mac-and-linux

Travis mac and linux

.travis.yml

@@ -1,10 +1,23 @@
-sudo: false # use Travis container based infrastructure
+sudo: false
 
-before_install:
-    - git clone https://github.com/sstephenson/bats.git /tmp/bats
-    - mkdir -p /tmp/local
-    - bash /tmp/bats/install.sh /tmp/local
-    - export PATH=$PATH:/tmp/local/bin
+language: c
+
+os:
+    - linux
+    - osx
+
+before_script:
+    -
+      if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+          brew install bats;
+      fi
+    -
+      if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+          git clone https://github.com/sstephenson/bats.git /tmp/bats;
+          mkdir -p /tmp/local && /tmp/bats/install.sh /tmp/local;
+          export PATH=$PATH:/tmp/local/bin;
+      fi
 
 script:
     - bats tests/run.bats
+    - bats tests/installer.bats

README.md

@@ -1,19 +1,11 @@
 [circleci-matrix][]
 ===================
 
-- **Linux:** [![Linux Build](https://travis-ci.org/michaelcontento/circleci-matrix.svg)](https://travis-ci.org/michaelcontento/circleci-matrix)
-- **OSX:** [![OSX Build](https://circleci.com/gh/michaelcontento/circleci-matrix/tree/master.svg?style=shield&circle-token=e8011fe1b683964966f04ecf39c170f65bd3f6dc)](https://circleci.com/gh/michaelcontento/circleci-matrix/tree/master)
+- **TravisCI:** [![Linux Build](https://travis-ci.org/michaelcontento/circleci-matrix.svg)](https://travis-ci.org/michaelcontento/circleci-matrix) (Linux & OSX)
+- **CircleCI:** [![OSX Build](https://circleci.com/gh/michaelcontento/circleci-matrix/tree/master.svg?style=shield&circle-token=e8011fe1b683964966f04ecf39c170f65bd3f6dc)](https://circleci.com/gh/michaelcontento/circleci-matrix/tree/master) (OSX)
 
 Small utility to mirror [TravisCI][]'s [build matrix][] on [CircleCI][].
 
-# No longer maintained
-
-My focus / time shifted and this tool is no longer maintained.
-
-If you want to step in and become the new owner - just ping me :smile:
-
-Thank you for your patience and using this module in the first place!
-
 ## Features
 
 - Simple one file distribution

circle.yml

@@ -1,6 +1,4 @@
 machine:
-    xcode:
-        version: 7.1
     environment:
         XCODE_SCHEME: ignoreMe
         XCODE_WORKSPACE: ignoreMe