Update CI script.

- Do not use zip.
- For Windows, use gnu toolchain, which will eliminate appveyor and MSVC
dependencies.
- Change integration tests logging level.
- Only cat logs when tests failed.
- Use docker command availability to decide whether to run integration tests.
- Fix compatible with Windows. libc on Windows does not have `waitpid`.
- Echo as error when exited unexpectedly.

Author: Junfeng Li

.travis.yml

@@ -14,7 +14,7 @@ env:
 matrix:
   include:
     # Linux
-    - env: INTEGRATION_TEST=1 TARGETS=i686-unknown-linux-musl:x86_64-unknown-linux-musl:i686-pc-windows-gnu:x86_64-pc-windows-gnu
+    - env: TARGETS=i686-unknown-linux-musl:x86_64-unknown-linux-musl:i686-pc-windows-gnu:x86_64-pc-windows-gnu
 
     # OSX
     - env: TARGETS=x86_64-apple-darwin
@@ -47,7 +47,7 @@ deploy:
   api_key:
     secure: Dr/oCr65KsSjcDk21+CS7cZ/UR/ktncwDLsQIF/UyFC0bCP5MFbQ76Cz7Dy460hMtjCiy/X4QukxtiF0oeaOvi1szbo29s1KYjc9xPVhI1roQUyGghkGzo+V5Ncum3pwKF1Mb/kotikh2QSFQJYA3o32HhMNVb+1bApD+bwyAsGlnlAYYWQy+EcIDByhG9B4HB2pScoblyPmbgQPftc/E3ldKkm4iPNiNNa9T/rlXazNOkuiAqbRR/qBI4sSVAFFvfzvEcva4k5X8wzWfdsiDk9HKnNL7iDzdMMExSOoIKoet6jK3E3f2VbwD7tRw+We2cB+EBrW7xtkcck/BbEtnXhiWpt+Gg4qxXjZ6RVXgVw9tH0CGp2FjZ6B2DQ/chtgzIzLE+iuhJwhRqJ+7IW7LgNrnEsi6QelCiNKsm0aqXEpU5BVoBXxBegJHgHhunkKPpqmhYps5KsH4RPzrduqk2LHlYriwaGumcEnOVXzoJJs0NE6RaFzwl5cxmiKxC8tl1/dE4w2WmYM8n3yMmfbCd520bTQbvOe68k/8iV7gqZmOnWX//PLJ6Zf+v7T0yhaFC8Oj8ueWUCCSd7TAC3rHxd52BVZnQF1xXosiiN2PyWGZGbxaO1Qh7UbF1Xk+ot2pwEsP5Q8h155DlYJ/3mMzLvSi6Cp+78YKsoFlpfDy6w=
   file_glob: true
-  file: $CRATE_NAME-$TRAVIS_TAG-*
+  file: bin/$CRATE_NAME-$TRAVIS_TAG-*
   overwrite: true
   on:
     tags: true

INSTALL.md

@@ -4,9 +4,7 @@ Obviously you need [neovim](https://github.com/neovim/neovim#install-from-packag
 
 # 2. Install dependencies
 
-For Windows user, [Microsoft Visual C++ 2015 runtime] is needed.
-
-[Microsoft Visual C++ 2015 runtime]: https://www.microsoft.com/en-us/download/details.aspx?id=52685
+None.
 
 # 3. Install this plugin
 Choose steps matching your plugin manager.

appveyor.yml

@@ -1,43 +1,16 @@
-# This script takes care of building your crate and packaging it for release
-
 set -ex
 
 package() {
-    local TARGET=$1 \
-        src=$(pwd) \
-        stage=
-
-    case $TRAVIS_OS_NAME in
-        linux)
-            stage=$(mktemp -d)
-            ;;
-        osx)
-            stage=$(mktemp -d -t tmp)
-            ;;
-    esac
-
-    test -f Cargo.lock || cargo generate-lockfile
-
-    cross build --target $TARGET --release
-    cp target/$TARGET/release/$BIN_NAME $stage/
-
-    cd $stage
-    tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz *
-    cd $src
+    BIN_NAME_TAG=$CRATE_NAME-$TRAVIS_TAG-$TARGET
+    if [[ $TARGET =~ .*windows.* ]]; then
+        BIN_NAME_TAG=$BIN_NAME_TAG.exe
+    fi
 
-    rm -rf $stage
+    cp -f target/$TARGET/release/$BIN_NAME bin/$BIN_NAME_TAG
 }
 
 release_tag() {
-    case $TRAVIS_OS_NAME in
-        linux)
-            cross build --target $TARGET --release
-            cp --force target/$TARGET/release/$BIN_NAME bin/
-            ;;
-        osx)
-            make release
-            ;;
-    esac
+    cp -f target/$TARGET/release/$BIN_NAME bin/
 
     git config --global user.email "[email protected]"
     git config --global user.name "Travis CI"
@@ -54,12 +27,12 @@ release_tag() {
 
 TARGETS=(${TARGETS//:/ })
 for TARGET in "${TARGETS[@]}"; do
+    BIN_NAME=$CRATE_NAME
     if [[ $TARGET =~ .*windows.* ]]; then
-        BIN_NAME=$CRATE_NAME.exe
-    else
-        BIN_NAME=$CRATE_NAME
+        BIN_NAME=$BIN_NAME.exe
     fi
 
-    release_tag $TARGET
-    package $TARGET
+    cross build --release --target $TARGET
+    release_tag
+    package
 done

ci/before_deploy.ps1

@@ -5,6 +5,6 @@ set -o xtrace
 
 make test
 
-if [[ ${INTEGRATION_TEST:-0} == 1 ]]; then
+if command -v docker > /dev/null ; then
     make integration-test-docker
 fi

ci/before_deploy.sh

@@ -9,7 +9,7 @@ if ($ENV:PROCESSOR_ARCHITECTURE -eq "AMD64") {
     $filename = $filename + 'i686'
 }
 
-$filename = $filename + '-pc-windows-msvc.exe'
+$filename = $filename + '-pc-windows-gnu.exe'
 $url = $url + $filename
 
 $path = "bin\$name.exe"

ci/script.sh

@@ -12,14 +12,12 @@ name=languageclient
 
 function try_curl() {
     command -v curl > /dev/null && \
-        curl -fL $1 | tar -xzf - && \
-        mv -f $name bin/
+        curl --fail --location $1 --output bin/$name
 }
 
 function try_wget() {
     command -v wget > /dev/null && \
-        wget -O - $1 | tar -xzf - && \
-        mv -f $name bin/
+        wget --output-document=bin/$name $1
 }
 
 function download() {
@@ -41,8 +39,8 @@ function try_build() {
 arch=$(uname -sm)
 binary=""
 case "${arch}" in
-    Linux\ *64) download $name-$version-x86_64-unknown-linux-musl.tar.gz ;;
-    Linux\ *86) download $name-$version-i686-unknown-linux-musl.tar.gz ;;
-    Darwin\ *64) download $name-$version-x86_64-apple-darwin.tar.gz ;;
+    Linux\ *64) download $name-$version-x86_64-unknown-linux-musl ;;
+    Linux\ *86) download $name-$version-i686-unknown-linux-musl ;;
+    Darwin\ *64) download $name-$version-x86_64-apple-darwin ;;
     *) echo "No pre-built binary available for ${arch}."; try_build ;;
 esac

install.ps1

@@ -108,7 +108,7 @@ function! s:HandleMessage(job, lines, event) abort
         endif
     elseif a:event == 'exit'
         if a:lines !=# '0'
-            echomsg 'LanguageClient exited with: ' . string(a:lines)
+            call s:Echoerr('languageclient exited with: ' . string(a:lines))
         endif
     else
         if $LANGUAGECLIENT_DEBUG

install.sh

@@ -138,25 +138,16 @@ impl ILanguageClient for Arc<Mutex<State>> {
                 line = line.strip();
                 if line.is_empty() {
                     count_empty_lines += 1;
-                    if count_empty_lines > 3 {
-                        let child_id = self.get(|state| match state.child_ids.get(&languageId) {
-                            Some(id) => Ok(*id),
-                            None => Err(format_err!("Failed to get child id")),
-                        })?;
-
-                        let mut status: libc::c_int = 0;
-                        unsafe { libc::waitpid(child_id as i32, &mut status, libc::WNOHANG) };
-                        if status != 0 {
-                            if let Err(err) = self.cleanup(languageId.clone()) {
-                                error!("Error in cleanup: {:?}", err);
-                            }
-
-                            let message = format!("Language server ({}) exited unexpectedly!", languageId);
-                            if let Err(err) = self.echoerr(&message) {
-                                error!("Error in echoerr: {:?}", err);
-                            };
-                            return Err(format_err!("{}", message));
+                    if count_empty_lines > 5 {
+                        if let Err(err) = self.cleanup(languageId.clone()) {
+                            error!("Error in cleanup: {:?}", err);
                         }
+
+                        let message = format!("Language server ({}) exited unexpectedly!", languageId);
+                        if let Err(err) = self.echoerr(&message) {
+                            error!("Error in echoerr: {:?}", err);
+                        };
+                        return Err(format_err!("{}", message));
                     }
 
                     let mut buf = vec![0; content_length];