diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2020-04-25 20:20:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-25 17:20:37 -0700 |
| commit | 1b42e95ece3a062b66f34d9f5f4509fcc9e161f1 (patch) | |
| tree | b7f542017ef66c7a7430676bd6e24493fde5fbee | |
| parent | ef0398fe88e6cc74f33fb20519997774168d7832 (diff) | |
| download | rneovim-1b42e95ece3a062b66f34d9f5f4509fcc9e161f1.tar.gz rneovim-1b42e95ece3a062b66f34d9f5f4509fcc9e161f1.tar.bz2 rneovim-1b42e95ece3a062b66f34d9f5f4509fcc9e161f1.zip | |
ci/travis: Enable ipv6 #12182
ref: a39c8b7ce30ddeed4329c28c42b1b699103dccab
ref: https://github.com/vim/vim/commit/bfe13ccc58ccb96f243a58309800410db1ccb52c
Also:
- Remove unused macos_rvm_dance() function. (It was there for reference,
but we have since resolved (or gave up) on Travis + macOS + ruby.
| -rwxr-xr-x | ci/before_script.sh | 6 | ||||
| -rw-r--r-- | ci/common/build.sh | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/ci/before_script.sh b/ci/before_script.sh index a0e87adb9e..1759dbe942 100755 --- a/ci/before_script.sh +++ b/ci/before_script.sh @@ -10,6 +10,12 @@ fi CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${CI_DIR}/common/build.sh" +# Enable ipv6 on Travis. ref: a39c8b7ce30d +if ! test "${TRAVIS_OS_NAME}" = osx ; then + echo "before_script.sh: enable ipv6" + sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0 +fi + # Test some of the configuration variables. if [[ -n "${GCOV}" ]] && [[ ! $(type -P "${GCOV}") ]]; then echo "\$GCOV: '${GCOV}' is not executable." diff --git a/ci/common/build.sh b/ci/common/build.sh index 02e1110a15..0024f2cbd5 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -86,12 +86,3 @@ build_nvim() { cd "${TRAVIS_BUILD_DIR}" } - -macos_rvm_dance() { - # neovim-ruby gem requires a ruby newer than the macOS default. - source ~/.rvm/scripts/rvm - rvm get stable --auto-dotfiles - rvm reload - rvm use 2.2.5 - rvm use -} |