Merge 'upstream/master' into pr-win-erw7

4 files changed, 11 insertions, 16 deletions

diff --git a/ci/before_install.sh b/ci/before_install.sh
index 86dd78af48..d8cf38d314 100755
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -7,10 +7,6 @@ if [[ "${CI_TARGET}" == lint ]]; then
   exit
 fi
 
-if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
-  >/dev/null brew update
-fi
-
 echo 'python info:'
 (
   2>&1 python --version || true
diff --git a/ci/build.ps1 b/ci/build.ps1
index 5b3eb4d27d..1ba3fa8a6b 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -50,6 +50,9 @@ if ($compiler -eq 'MINGW') {
   # Add MinGW to the PATH
   $env:PATH = "C:\msys64\mingw$bits\bin;$env:PATH"
 
+  # Avoid pacman "warning" which causes non-zero return code. https://github.com/open62541/open62541/issues/2068
+  & C:\msys64\usr\bin\mkdir -p /var/cache/pacman/pkg
+
   # Build third-party dependencies
   C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Su" ; exitIfFailed
   C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm --needed -S $mingwPackages" ; exitIfFailed
@@ -65,14 +68,14 @@ elseif ($compiler -eq 'MSVC') {
 }
 
 # Setup python (use AppVeyor system python)
-C:\Python27\python.exe -m pip install neovim ; exitIfFailed
-C:\Python35\python.exe -m pip install neovim ; exitIfFailed
+C:\Python27\python.exe -m pip install pynvim ; exitIfFailed
+C:\Python35\python.exe -m pip install pynvim ; exitIfFailed
 # Disambiguate python3
 move c:\Python35\python.exe c:\Python35\python3.exe
 $env:PATH = "C:\Python35;C:\Python27;$env:PATH"
 # Sanity check
-python  -c "import neovim; print(str(neovim))" ; exitIfFailed
-python3 -c "import neovim; print(str(neovim))" ; exitIfFailed
+python  -c "import pynvim; print(str(pynvim))" ; exitIfFailed
+python3 -c "import pynvim; print(str(pynvim))" ; exitIfFailed
 
 $env:PATH = "C:\Ruby24\bin;$env:PATH"
 gem.cmd install neovim
diff --git a/ci/common/test.sh b/ci/common/test.sh
index a6afd1df4c..f1c5454e3f 100644
--- a/ci/common/test.sh
+++ b/ci/common/test.sh
@@ -83,7 +83,7 @@ valgrind_check() {
 
 asan_check() {
   if test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then
-    check_logs "${1}" "*san.*" | asan_symbolize
+    check_logs "${1}" "*san.*" | $ASAN_SYMBOLIZE
   fi
 }
 
diff --git a/ci/install.sh b/ci/install.sh
index 2cb8e78e67..12985098cd 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -8,10 +8,6 @@ if [[ "${CI_TARGET}" == lint ]]; then
 fi
 
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
-  brew install ninja
-  brew install gettext
-  brew reinstall -s libtool
-  brew install ccache
   export PATH="/usr/local/opt/ccache/libexec:$PATH"
 fi
 
@@ -26,11 +22,11 @@ if ! [ "${TRAVIS_OS_NAME}" = osx ] ; then
   # Use default CC to avoid compilation problems when installing Python modules.
   echo "Install neovim module for Python 2."
   CC=cc python2.7 -m pip -q install --user --upgrade neovim
-
-  echo "Install neovim RubyGem."
-  gem install --no-document --version ">= 0.2.0" neovim
 fi
 
+echo "Install neovim RubyGem."
+gem install --no-document --version ">= 0.8.0" neovim
+
 echo "Install neovim npm package"
 npm install -g neovim
 npm link neovim