Merge pull request #729 from ichizok/fix/ci-macvim

CI: Improve test efficiency on travis-osx

Author: ujihisa

.travis.yml

@@ -22,16 +22,9 @@ jobs:
         - THEMIS_PROFILE=vim-profile-master.txt
     - name: Vim MacVim latest
       os: osx
-      osx_image: xcode9.4
       env:
+        - VIM_VERSION=latest
         - THEMIS_PROFILE=vim-profile-osx.txt
-      cache:
-        directories:
-          - $HOME/Library/Caches/Homebrew/
-          - /usr/local/Homebrew/Library/Homebrew/vendor/
-          - /usr/local/Homebrew/Library/Taps/
-      before_cache:
-        - brew cleanup
     - name: Vim Lint only
       os: linux
       env:
@@ -45,16 +38,16 @@ addons:
       - python-dev
       - python3-dev
       - python3-pip
-  homebrew:
-    packages:
-      - macvim
-    update: true
 
 install:
   - rvm reset
-  - bash scripts/install-vim.sh
-  - export PATH=$HOME/vim/bin:$PATH
-    # Install https://github.com/Vimjas/covimerage
+  - |
+    if [[ -n "${VIM_VERSION}" ]]; then
+      bash scripts/install-lua.sh
+      bash scripts/install-vim.sh
+    fi
+  - export PATH=${HOME}/bin:${PATH}
+  # Install https://github.com/Vimjas/covimerage
   - pip3 install --user --upgrade pip
   - pip3 install --user --upgrade setuptools
   - pip3 install --user covimerage

scripts/install-lua.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -ev
+
+LUA_DIST=lua-5.3.5
+
+case "${TRAVIS_OS_NAME}" in
+	linux)
+		LUA_TARGET=linux
+		LUA_SHLIB=liblua.so
+		;;
+	osx)
+		LUA_TARGET=macosx
+		LUA_SHLIB=liblua5.3.dylib
+		;;
+	*)
+		echo "Unknown value of \${TRAVIS_OS_NAME}: ${TRAVIS_OS_NAME}"
+		exit 65
+		;;
+esac
+
+cd "${TMPDIR:-/tmp}"
+curl -LOs "https://www.lua.org/ftp/${LUA_DIST}.tar.gz"
+tar xf "${LUA_DIST}.tar.gz"
+cd "${LUA_DIST}"
+cat <<EOT >src/Makefile.shared
+LUA_SO=	${LUA_SHLIB}
+
+\$(LUA_SO): \$(BASE_O)
+	\$(CC) -shared -o \$@ \$^
+EOT
+echo 'include Makefile.shared' >>src/Makefile
+make "${LUA_TARGET}" MYCFLAGS='-fPIC -fno-common'
+make -C src "${LUA_SHLIB}"
+make install INSTALL_TOP="${HOME}/lua" TO_LIB="${LUA_SHLIB}"
+cd "${HOME}/lua/lib"

scripts/install-vim.sh

@@ -2,25 +2,45 @@
 
 set -ev
 
+: ${TMPDIR:=/tmp}
+
 case "${TRAVIS_OS_NAME}" in
 	linux)
-		if [[ "${VIM_VERSION}" == "" ]]; then
+		if [[ -z "${VIM_VERSION}" ]]; then
 			exit
 		fi
-		git clone --depth 1 --branch "${VIM_VERSION}" https://github.com/vim/vim /tmp/vim
-		cd /tmp/vim
-		./configure --prefix="${HOME}/vim" --with-features=huge --enable-pythoninterp \
-			--enable-python3interp --enable-fail-if-missing
+		git clone --depth 1 --branch "${VIM_VERSION}" https://github.com/vim/vim "${TMPDIR}/vim"
+		cd "${TMPDIR}/vim"
+		./configure --prefix="${HOME}/vim" --with-features=huge --with-lua-prefix="${HOME}/lua" \
+			--enable-luainterp --enable-pythoninterp --enable-python3interp --enable-fail-if-missing
 		make -j2
 		make install
+		VIM_BIN=vim/bin/vim
 		;;
 	osx)
-		# Instead of --with-override-system-vim, manually link the executable because
-		# it prevents MacVim installation with a bottle.
-		ln -fs "$(brew --prefix macvim)/bin/mvim" "/usr/local/bin/vim"
+		VIM_URL=$(curl -s --retry 3 https://vim-jp.org/redirects/macvim-dev/macvim/latest.json \
+			| sed 's@.*"redirect_url":"\([^"]*\)".*@\1@')
+		if [[ -z "${VIM_URL}" ]]; then
+			echo "Can't get Vim's URL"
+			exit 64
+		fi
+		echo "Download from ${VIM_URL}"
+		curl -L -s -o "${TMPDIR}/MacVim.dmg" "${VIM_URL}"
+		hdiutil attach -quiet -mountpoint "/Volumes/MacVim" "${TMPDIR}/MacVim.dmg"
+		cp -a "/Volumes/MacVim/MacVim.app" "${HOME}"
+		hdiutil detach "/Volumes/MacVim"
+		VIM_BIN=MacVim.app/Contents/MacOS/Vim
 		;;
 	*)
 		echo "Unknown value of \${TRAVIS_OS_NAME}: ${TRAVIS_OS_NAME}"
 		exit 65
 		;;
 esac
+
+mkdir -p "${HOME}/bin"
+cat <<EOT >"${HOME}/bin/vim"
+#!/bin/bash
+export LD_LIBRARY_PATH=\${HOME}/lua/lib:\${LD_LIBRARY_PATH}
+exec "\${HOME}/${VIM_BIN}" "\$@"
+EOT
+chmod +x "${HOME}/bin/vim"