Merge pull request #10186 from blueyed/fix-cd

ci: minor improvements

.travis.yml

@@ -68,7 +68,7 @@ jobs:
       # store 32-bit dependencies in a separate cache.
       compiler: gcc
       env: BUILD_32BIT=ON
-    - if: branch = master
+    - if: branch = master AND commit_message !~ /\[skip.lint\]/
       os: linux
       env: CI_TARGET=lint
 

appveyor.yml

@@ -20,6 +20,8 @@ init:
     }
 # RDP
 #- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+matrix:
+  fast_finish: true
 install: []
 before_build:
 - ps: Install-Product node 8

ci/before_script.sh

@@ -20,8 +20,8 @@ if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; the
   exit 1
 fi
 
-# Show ccache stats so we can compare in before_cache
-ccache -s 2>/dev/null || true
+# Reset ccache stats for real results in before_cache.
+ccache --zero-stats
 
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   # Adds user to a dummy group.

ci/build.ps1

@@ -129,6 +129,8 @@ if ($uploadToCodecov) {
 }
 
 # Old tests
+# Add MSYS to path, required for e.g. `find` used in test scripts.
+# But would break functionaltests, where its `more` would be used then.
 $env:PATH = "C:\msys64\usr\bin;$env:PATH"
 & "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1
 

ci/common/test.sh

@@ -32,11 +32,12 @@ check_core_dumps() {
     shift
   fi
   local app="${1:-${BUILD_DIR}/bin/nvim}"
+  local cores
   if test "${TRAVIS_OS_NAME}" = osx ; then
-    local cores="$(find /cores/ -type f -print)"
+    cores="$(find /cores/ -type f -print)"
     local _sudo='sudo'
   else
-    local cores="$(find ./ -type f -name 'core.*' -print)"
+    cores="$(find ./ -type f -name 'core.*' -print)"
     local _sudo=
   fi
 
@@ -94,7 +95,7 @@ run_unittests() {(
     fail 'unittests' F 'Unit tests failed'
   fi
   submit_coverage unittest
-  check_core_dumps "$(which luajit)"
+  check_core_dumps "$(command -v luajit)"
   exit_suite
 )}
 

cmake/mingw32-w64-cross-travis.toolchain.cmake

@@ -1,53 +0,0 @@
-#
-# Mingw-w64 cross compiler toolchain
-#
-# - The usual CMAKE variables will point to the cross compiler
-# - HOST_EXE_LINKER, HOST_C_COMPILER, HOST_EXE_LINKER_FLAGS,
-#   HOST_C_FLAGS point to a host compiler
-#
-
-set(MINGW_TRIPLET i686-w64-mingw32)
-# For x86_64 use
-#set(MINGW_TRIPLET x86_64-w64-mingw32)
-
-# The location of your toolchain sys-root
-set(MINGW_PREFIX_PATH /opt/mingw32/${MINGW_TRIPLET}/)
-# or sometimes like this
-#set(MINGW_PREFIX_PATH /usr/${MINGW_TRIPLET}/sys-root)
-
-# the name of the target operating system
-set(CMAKE_SYSTEM_NAME Windows)
-
-# which compilers to use for C and C++
-set(CMAKE_C_COMPILER ${MINGW_TRIPLET}-gcc)
-set(CMAKE_CXX_COMPILER ${MINGW_TRIPLET}-g++)
-set(CMAKE_RC_COMPILER ${MINGW_TRIPLET}-windres)
-set(CMAKE_C_COMPILER ${MINGW_TRIPLET}-gcc)
-set(CMAKE_CXX_COMPILER ${MINGW_TRIPLET}-g++)
-set(CMAKE_RC_COMPILER ${MINGW_TRIPLET}-windres)
-
-# Where is the target environment located
-set(CMAKE_FIND_ROOT_PATH "${MINGW_PREFIX_PATH}/mingw")
-
-# adjust the default behaviour of the FIND_XXX() commands:
-# search headers and libraries in the target environment, search
-# programs in the host environment
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(CROSS_TARGET ${MINGW_TRIPLET})
-
-# We need a host compiler too - assuming mildly sane Unix
-# defaults here
-set(HOST_C_COMPILER cc)
-set(HOST_EXE_LINKER ld)
-
-if (MINGW_TRIPLET MATCHES "^x86_64")
-  set(HOST_C_FLAGS)
-  set(HOST_EXE_LINKER_FLAGS)
-else()
-  # In 32 bits systems have the HOST compiler generate 32 bits binaries
-  set(HOST_C_FLAGS -m32)
-  set(HOST_EXE_LINKER_FLAGS -m32)
-endif()