Fix ruby crashes from xcpretty on Travis

livecodefraser · livecodefraser · commit 3b6b32fa1b80 · 2016-10-05T11:08:15.000+01:00
Ruby on Travis seems to be crashing when loading certain gems so force
a known-working version to be used.
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,11 @@ env:
 
 # Install any required tools
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then sudo gem install xcpretty ; fi
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then 
+      rvm --default use 2.2.1
+      gem install xcpretty
+    fi
 
 # Set up the source tree by fetching Linux-specific prebuilt objects
 install: 
@@ -39,19 +43,19 @@ install:
 
 # Bootstrap the LCB compiler, build the default target set and run a
 # the default test suite.
-script: >
+script: |
   case "${TRAVIS_OS_NAME}" in
     linux)
-      BUILD_PLATFORM=linux ;
-      CHECK_COMMAND=xvfb-run ;
-      LICENSE_DIR="${HOME}/.runrev/licenses" ;
+      BUILD_PLATFORM=linux
+      CHECK_COMMAND=xvfb-run
+      LICENSE_DIR="${HOME}/.runrev/licenses"
       ;;
     osx)
-      BUILD_PLATFORM=mac ;
-      CHECK_COMMAND= ;
-      LICENSE_DIR="${HOME}/Library/Application Support/RunRev/Licenses" ;
-      export XCODEBUILD="set -o pipefail && xcodebuild" ;
-      export XCODEBUILD_FILTER="| xcpretty" ;
+      BUILD_PLATFORM=mac
+      CHECK_COMMAND=
+      LICENSE_DIR="${HOME}/Library/Application Support/RunRev/Licenses"
+      export XCODEBUILD="set -o pipefail && xcodebuild"
+      export XCODEBUILD_FILTER="| xcpretty"
       ;;
   esac
 
@@ -90,4 +94,4 @@ addons:
       - libpopt-dev
       - libesd0-dev
       - liblcms-dev
-      - xvfb
+      - xvfb
diff --git a/Makefile b/Makefile
@@ -45,12 +45,7 @@ else
 endif
 
 # Prettifying output for CI builds
-ifeq ($(TRAVIS),true)
-  XCODEBUILD := set -o pipefail && $(XCODEBUILD)
-  XCODEBUILD_FILTER := | xcpretty
-else
-  XCODEBUILD_FILTER :=
-endif 
+XCODEBUILD_FILTER ?= 
 
 include Makefile.common
 
