Travis: Add Sierra support (Homebrew#28732)

* .travis.yml: xcode8 to xcode8.2 (Sierra) * Updated Travis workarounds for Sierra/RVM
martavoi · Jan 7, 2017 · 7e9dfdf · 7e9dfdf
1 parent a4107ec
commit 7e9dfdf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ sudo: false
 matrix:
   include:
     - os: osx
-      osx_image: xcode8
+      osx_image: xcode8.2
       rvm: system
     - os: osx
       osx_image: xcode7.3

diff --git a/ci/travis/before_script.sh b/ci/travis/before_script.sh
@@ -10,9 +10,10 @@
 
 header 'Running before_script.sh...'
 
-# work around travis osx bug
-# https://github.com/travis-ci/travis-ci/issues/6307#issuecomment-233315824
-run rvm get head
+# Required workarounds
+if ! command -v gpg2 &>/dev/null; then brew install gpg2; fi # After El Capitan is no longer needed, this can likely be removed
+gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 # Required by RVM: https://rvm.io/rvm/security
+run rvm get head # Required due to Travis bug: https://github.com/travis-ci/travis-ci/issues/6307#issuecomment-233315824
 
 # see https://github.com/travis-ci/travis-ci/issues/2666
 run export BRANCH_COMMIT="${TRAVIS_COMMIT_RANGE##*.}"