From d554a6c7f0e9ed84f2e16d4977740a1584d11198 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Thu, 8 Mar 2018 20:31:34 +0100 Subject: ci/AppVeyor: fix `set` whitespace quoting --- ci/build.bat | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ci') diff --git a/ci/build.bat b/ci/build.bat index 3fa185f646..8bf310851e 100644 --- a/ci/build.bat +++ b/ci/build.bat @@ -6,19 +6,19 @@ if "%CONFIGURATION%" == "MINGW_32" ( set ARCH=x86_64 set BITS=64 if "%CONFIGURATION%" == "MINGW_64-gcov" ( - set USE_GCOV="-DUSE_GCOV=ON" + set "USE_GCOV=-DUSE_GCOV=ON" ) ) else if "%CONFIGURATION%" == "MSVC_32" ( - set CMAKE_GENERATOR="Visual Studio 15 2017" + set "CMAKE_GENERATOR=Visual Studio 15 2017" ) else if "%CONFIGURATION%" == "MSVC_64" ( - set CMAKE_GENERATOR="Visual Studio 15 2017 Win64" + set "CMAKE_GENERATOR=Visual Studio 15 2017 Win64" ) if "%CONFIGURATION:~0,5%" == "MINGW" ( :: These are native MinGW builds, but they use the toolchain inside :: MSYS2, this allows using all the dependencies and tools available :: in MSYS2, but we cannot build inside the MSYS2 shell. - set CMAKE_GENERATOR="MinGW Makefiles" + set "CMAKE_GENERATOR=MinGW Makefiles" set CMAKE_GENERATOR_ARGS=VERBOSE=1 :: Add MinGW to the PATH and remove the Git directory because it :: has a conflicting sh.exe @@ -49,14 +49,14 @@ where.exe neovim-node-host.cmd || goto :error mkdir .deps cd .deps -cmake -G %CMAKE_GENERATOR% -DCMAKE_BUILD_TYPE=RelWithDebInfo ..\third-party\ || goto :error +cmake -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..\third-party\ || goto :error cmake --build . -- %CMAKE_GENERATOR_ARGS% || goto :error cd .. :: Build Neovim mkdir build cd build -cmake -G %CMAKE_GENERATOR% -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUSTED_OUTPUT_TYPE=nvim %USE_GCOV% -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error +cmake -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUSTED_OUTPUT_TYPE=nvim %USE_GCOV% -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error cmake --build . --config RelWithDebInfo -- %CMAKE_GENERATOR_ARGS% || goto :error bin\nvim --version || goto :error @@ -78,7 +78,7 @@ if defined USE_GCOV ( ) :: The default cpack in the PATH is not CMake -set PATH=C:\Program Files (x86)\CMake\bin\cpack.exe;%PATH% +set "PATH=C:\Program Files (x86)\CMake\bin\cpack.exe;%PATH%" :: Build artifacts cpack -G ZIP -C RelWithDebInfo if defined APPVEYOR_REPO_TAG_NAME cpack -G NSIS -C RelWithDebInfo -- cgit From 968c7ab17eedd7f3c53f3860ff6fbcaddca417e0 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 9 Mar 2018 20:55:10 +0100 Subject: ci/travis: use ninja instead of make --- ci/common/build.sh | 9 ++++++--- ci/install.sh | 1 + ci/run_lint.sh | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'ci') diff --git a/ci/common/build.sh b/ci/common/build.sh index 2748b15b0d..13305c0bad 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -1,5 +1,8 @@ top_make() { - ${MAKE_CMD} "$@" + echo '================================================================================' + # Travis has 1.5 virtual cores according to: + # http://docs.travis-ci.com/user/speeding-up-the-build/#Paralellizing-your-build-on-one-VM + ninja "$@" } build_make() { @@ -36,7 +39,7 @@ build_deps() { # update CMake configuration and update to newer deps versions. cd "${DEPS_BUILD_DIR}" echo "Configuring with '${DEPS_CMAKE_FLAGS}'." - CC= cmake ${DEPS_CMAKE_FLAGS} "${TRAVIS_BUILD_DIR}/third-party/" + CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${TRAVIS_BUILD_DIR}/third-party/" if ! top_make; then exit 1 @@ -56,7 +59,7 @@ prepare_build() { mkdir -p "${BUILD_DIR}" cd "${BUILD_DIR}" echo "Configuring with '${CMAKE_FLAGS} $@'." - cmake ${CMAKE_FLAGS} "$@" "${TRAVIS_BUILD_DIR}" + cmake -G Ninja ${CMAKE_FLAGS} "$@" "${TRAVIS_BUILD_DIR}" } build_nvim() { diff --git a/ci/install.sh b/ci/install.sh index 60d9507bfb..9deaa601b4 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -8,6 +8,7 @@ if [[ "${CI_TARGET}" == lint ]]; then fi if [[ "${TRAVIS_OS_NAME}" == osx ]]; then + brew install ninja brew install gettext brew reinstall -s libtool fi diff --git a/ci/run_lint.sh b/ci/run_lint.sh index e7f6727448..ae9adb7c87 100755 --- a/ci/run_lint.sh +++ b/ci/run_lint.sh @@ -10,19 +10,19 @@ source "${CI_DIR}/common/suite.sh" enter_suite 'clint' -run_test 'top_make clint-full' clint +run_test 'make clint-full' clint exit_suite --continue enter_suite 'testlint' -run_test 'top_make testlint' testlint +run_test 'make testlint' testlint exit_suite --continue enter_suite 'lualint' -run_test 'top_make lualint' lualint +run_test 'make lualint' lualint exit_suite --continue @@ -31,7 +31,7 @@ enter_suite single-includes CLICOLOR_FORCE=1 run_test_wd \ --allow-hang \ 10s \ - 'top_make check-single-includes' \ + 'make check-single-includes' \ 'csi_clean' \ single-includes -- cgit From 45e81e03f880f9ad6f23e57eed00d5178f47fd2f Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 10 Mar 2018 20:43:51 +0100 Subject: ci/macOS: skip python2 on travis macOS macOS travis builds recently started failing (travis caches were cleared recently, maybe related). python2 is reasonably covered by linux CI. Not going to waste time on it for macOS CI. ==> Installing python@2 ==> Downloading https://homebrew.bintray.com/bottles/python@2-2.7.14_3.el_capita ==> Pouring python@2-2.7.14_3.el_capitan.bottle.tar.gz Error: The `brew link` step did not complete successfully The formula built, but is not symlinked into /usr/local Could not symlink bin/2to3-2 Target /usr/local/bin/2to3-2 is a symlink belonging to python. You can unlink it: brew unlink python To force the link and overwrite all conflicting files: brew link --overwrite python@2 To list all files that would be deleted: brew link --overwrite --dry-run python@2 Possible conflicting files are: /usr/local/bin/2to3-2 -> /usr/local/Cellar/python/2.7.12_1/bin/2to3-2 /usr/local/bin/2to3-2.7 -> /usr/local/Cellar/python/2.7.12_1/bin/2to3-2.7 /usr/local/bin/idle -> /usr/local/Cellar/python/2.7.12_1/bin/idle ... --- ci/before_install.sh | 10 ++-------- ci/install.sh | 10 ++++++---- 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'ci') diff --git a/ci/before_install.sh b/ci/before_install.sh index f696b85afc..9a3e192536 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -23,20 +23,14 @@ echo 'python info:' 2>&1 pyenv versions || true ) | sed 's/^/ /' -if [[ "${TRAVIS_OS_NAME}" == osx ]]; then - echo "Install Python 2." - brew install python@2 -fi - -echo "Upgrade Python 2 pip." -pip2.7 -q install --user --upgrade pip - if [[ "${TRAVIS_OS_NAME}" == osx ]]; then echo "Upgrade Python 3." brew upgrade python echo "Upgrade Python 3 pip." pip3 -q install --user --upgrade pip else + echo "Upgrade Python 2 pip." + pip2.7 -q install --user --upgrade pip echo "Upgrade Python 3 pip." # Allow failure. pyenv pip3 on travis is broken: # https://github.com/travis-ci/travis-ci/issues/8363 diff --git a/ci/install.sh b/ci/install.sh index 9deaa601b4..053549d6db 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -13,16 +13,18 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]]; then brew reinstall -s libtool fi -# Use default CC to avoid compilation problems when installing Python modules. -echo "Install neovim module for Python 2." -CC=cc pip2.7 -q install --user --upgrade neovim - echo "Install neovim module for Python 3." # Allow failure. pyenv pip3 on travis is broken: # https://github.com/travis-ci/travis-ci/issues/8363 CC=cc pip3 -q install --user --upgrade neovim || true if ! [ "${TRAVIS_OS_NAME}" = osx ] ; then + # Update PATH for pip. + export PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:$PATH" + # Use default CC to avoid compilation problems when installing Python modules. + echo "Install neovim module for Python 2." + CC=cc pip2.7 -q install --user --upgrade neovim + echo "Install neovim RubyGem." gem install --no-document --version ">= 0.2.0" neovim fi -- cgit From b0b656dd37567dea5e3f58e7821c7442831403cb Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 11 Mar 2018 13:31:10 +0100 Subject: ci/travis: rename $BUILD_NVIM_DEPS to $CACHE_ENABLE --- ci/common/build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ci') diff --git a/ci/common/build.sh b/ci/common/build.sh index 13305c0bad..772b696969 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -20,14 +20,13 @@ build_deps() { rm -rf "${DEPS_BUILD_DIR}" - # If there is a valid cache and we're not forced to recompile, - # use cached third-party dependencies. - if test -f "${CACHE_MARKER}" && test "${BUILD_NVIM_DEPS}" != "true" ; then + # Use cached dependencies if $CACHE_MARKER exists. + if test -f "${CACHE_MARKER}" && ! test "${CACHE_ENABLE}" = "false" ; then local statcmd="stat -c '%y'" if test "${TRAVIS_OS_NAME}" = osx ; then statcmd="stat -f '%Sm'" fi - echo "Using third-party dependencies from Travis's cache (last updated: $(${statcmd} "${CACHE_MARKER}"))." + echo "Using third-party dependencies from Travis cache (last update: $(${statcmd} "${CACHE_MARKER}"))." mkdir -p "$(dirname "${DEPS_BUILD_DIR}")" mv "${HOME}/.cache/nvim-deps" "${DEPS_BUILD_DIR}" -- cgit