Merge pull request #1651 from andschwa/andschwa/osx-fpm

Fix FPM on Travis CI OS X

.travis.yml

@@ -10,7 +10,7 @@ os:
   - osx
 sudo: required
 dist: trusty
-osx_image: xcode8
+osx_image: xcode7.3
 
 addons:
   artifacts:
@@ -24,5 +24,6 @@ install:
   - git config --global url.git@github.com:.insteadOf https://github.com/
   - git submodule update --init
   - (cd tools && ./download.sh)
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm use 2.2.1; fi # Default 2.0.0 Ruby is buggy
 
 script: ./tools/travis.sh

build.psm1

@@ -635,8 +635,6 @@ function Start-PSBootstrap {
             $Deps += "curl", "cmake"
             # .NET Core required runtime libraries
             $Deps += "openssl"
-            # Packaging tools
-            if ($Package) { $Deps += "ruby" }
             # Install dependencies
             brew install $Deps
         }

tools/travis.sh

@@ -1,6 +1,7 @@
+set -x
 ulimit -n 4096
 # Only build packages for branches, not pull requests
-if [[ $TRAVIS_PULL_REQUEST == false ]]; then
+if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then
     powershell -c "Import-Module ./build.psm1; Start-PSBootstrap -Package; Start-PSBuild -CrossGen; Start-PSPackage; Start-PSPester; Start-PSxUnit"
 else
     powershell -c "Import-Module ./build.psm1; Start-PSBootstrap; Start-PSBuild -CrossGen; Start-PSPester; Start-PSxUnit"