Merge branch 'osx-ci'

Author: aslakhellesoy

.travis.yml

@@ -7,14 +7,17 @@ compiler:
   - i686-w64-mingw32-gcc
 
 before_install:
-  - sudo dpkg --add-architecture i386
-  - sudo add-apt-repository -y ppa:ubuntu-wine/ppa
-  - sudo apt-get update -qq
-  - sudo apt-get remove -qq -y mingw32
-  - sudo apt-get install -q -y mingw-w64
-  - sudo apt-get install --no-install-recommends -y wine1.8
+  - if [[ "$CC" == "i686-w64-mingw32-gcc" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo dpkg --add-architecture i386                       ; fi
+  - if [[ "$CC" == "i686-w64-mingw32-gcc" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:ubuntu-wine/ppa          ; fi
+  - if [[ "$CC" == "i686-w64-mingw32-gcc" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq                                 ; fi
+  - if [[ "$CC" == "i686-w64-mingw32-gcc" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get remove -qq -y mingw32                      ; fi
+  - if [[ "$CC" == "i686-w64-mingw32-gcc" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -q -y mingw-w64                    ; fi
+  - if [[ "$CC" == "i686-w64-mingw32-gcc" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install --no-install-recommends -y wine1.8 ; fi
+  - if [[ "$CC" == "i686-w64-mingw32-gcc" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install mingw-w64                                    ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install jq                                                                                    ; fi
 
-script: make CC=${CC}
+# Can't get Wine to work on OSX, so skip runnning tests on that combo (only do a build) 
+script: if [[ "$CC" == "i686-w64-mingw32-gcc" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make CC=${CC} cli; else make CC=${CC} ; fi
 
 notifications:
   webhooks: