From 3d3c783fead3dc328ede3ccd0fb7b3befcad191a Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Thu, 3 Oct 2019 05:40:25 +0200
Subject: ci: Travis: simplify 32bit build (#11093)

- `CMAKE_SYSTEM_LIBRARY_PATH` should not be used, and is a
  semicolon-separated list anyway [1]

1: https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_LIBRARY_PATH.html
---
 ci/common/build.sh | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'ci/common/build.sh')

diff --git a/ci/common/build.sh b/ci/common/build.sh
index 8e9b2f8ebb..02e1110a15 100644
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -18,9 +18,6 @@ build_make() {
 }
 
 build_deps() {
-  if test "${BUILD_32BIT}" = ON ; then
-    DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
-  fi
   if test "${FUNCTIONALTEST}" = "functionaltest-lua" \
      || test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON"
@@ -53,9 +50,6 @@ prepare_build() {
   if test -n "${CLANG_SANITIZER}" ; then
     CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON"
   fi
-  if test "${BUILD_32BIT}" = ON ; then
-    CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
-  fi
 
   mkdir -p "${BUILD_DIR}"
   cd "${BUILD_DIR}"
-- 
cgit 


From 1b42e95ece3a062b66f34d9f5f4509fcc9e161f1 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 25 Apr 2020 20:20:37 -0400
Subject: 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.
---
 ci/common/build.sh | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'ci/common/build.sh')

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
-}
-- 
cgit