travis: mark workarounds for removal after ElCap is no longer needed (#31911)

This commit is contained in:
Vítor Galvão 2017-04-05 13:24:19 +01:00 committed by GitHub
parent e5aa0b9571
commit df824cf6d7
2 changed files with 4 additions and 1 deletions

View File

@ -22,6 +22,9 @@ cache:
install: true # skip install step
before_install: set -e # REMOVE AFTER EL CAPITAN IS NO LONGER NEEDED
after_script: set +e # REMOVE AFTER EL CAPITAN IS NO LONGER NEEDED
before_script:
- . ci/travis/before_script.sh

View File

@ -11,7 +11,7 @@
header 'Running before_script.sh...'
# Required workarounds
if ! run command -v gpg2 &>/dev/null; then run brew unlink gnupg && run brew install gpg2; fi # After El Capitan is no longer needed, this can likely be removed
if ! run command -v gpg2 &>/dev/null; then run brew unlink gnupg && run brew install gpg2; fi # REMOVE AFTER EL CAPITAN IS NO LONGER NEEDED
run gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 # Required by RVM: https://rvm.io/rvm/security
run rvm get stable # Required due to Travis bug: https://github.com/travis-ci/travis-ci/issues/6307#issuecomment-233315824