Skip to content
This repository has been archived by the owner on Mar 13, 2022. It is now read-only.

Commit

Permalink
Auto merge of #45 - micbou:fix-macos-travis, r=vheon
Browse files Browse the repository at this point in the history
[READY] Fix macOS builds on Travis

See PR ycm-core/YouCompleteMe#2840.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/vheon/jedihttp/45)
<!-- Reviewable:end -->
  • Loading branch information
zzbot committed Dec 15, 2017
2 parents 67c8d27 + f06d2a5 commit ff8d136
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
set -e

if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
# Newer version of RVM fixes a bug that would stop the execution of this
# script with the "shell_session_update: command not found" error when
# sourcing it.
rvm get stable
# RVM overrides the cd, popd, and pushd shell commands, causing the
# "shell_session_update: command not found" error on macOS when executing those
# commands.
unset -f cd popd pushd

# Install pyenv
PYENV_ROOT="${HOME}/.pyenv"
Expand Down

0 comments on commit ff8d136

Please sign in to comment.