diff options
| -rwxr-xr-x | .ci/before_script.sh | 4 | ||||
| -rw-r--r-- | .ci/common/build.sh | 6 | ||||
| -rwxr-xr-x | .ci/install.sh | 7 | ||||
| -rwxr-xr-x | .ci/run_tests.sh | 8 | ||||
| -rw-r--r-- | .travis.yml | 8 |
5 files changed, 2 insertions, 31 deletions
diff --git a/.ci/before_script.sh b/.ci/before_script.sh index 23940ab2e2..4a75e89fbe 100755 --- a/.ci/before_script.sh +++ b/.ci/before_script.sh @@ -19,10 +19,6 @@ if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; the echo "\$LLVM_SYMBOLIZER: '${LLVM_SYMBOLIZER}' is not executable." exit 1 fi -if [ "${BUILD_32BIT}" = ON ] && [ "${BUILD_MINGW}" = ON ]; then - >&2 echo "32-bit MinGW builds not supported." - exit 1 -fi if [[ "${TRAVIS_OS_NAME}" == osx ]]; then # Adds user to a dummy group. diff --git a/.ci/common/build.sh b/.ci/common/build.sh index c89d4c559b..5cf34935d6 100644 --- a/.ci/common/build.sh +++ b/.ci/common/build.sh @@ -2,9 +2,6 @@ build_deps() { if [[ "${BUILD_32BIT}" == ON ]]; then DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}" fi - if [[ "${BUILD_MINGW}" == ON ]]; then - DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_MINGW}" - fi if [[ "${FUNCTIONALTEST}" == "functionaltest-lua" ]]; then DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON" fi @@ -47,9 +44,6 @@ build_nvim() { if [[ "${BUILD_32BIT}" == ON ]]; then CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}" fi - if [[ "${BUILD_MINGW}" == ON ]]; then - CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_MINGW}" - fi mkdir -p "${BUILD_DIR}" cd "${BUILD_DIR}" diff --git a/.ci/install.sh b/.ci/install.sh index f809bb06ea..9df5b6e980 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -10,13 +10,6 @@ fi if [[ "${TRAVIS_OS_NAME}" == osx ]]; then brew install gettext brew reinstall -s libtool -elif [[ "${BUILD_MINGW}" == ON ]]; then - # TODO: When Travis gets a recent version of Mingw-w64 use packages: - # binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64-dev mingw-w64-tools - - echo "Downloading MinGW..." - curl -sSL "https://github.com/neovim/deps/raw/master/opt/i686-w64-mingw32-gcc-4.8.0-linux64_rubenvb.tar.xz" \ - | tar xJf - -C "${HOME}/.local" fi # Use default CC to avoid compilation problems when installing Python modules. diff --git a/.ci/run_tests.sh b/.ci/run_tests.sh index 656ea16e37..d542a2f121 100755 --- a/.ci/run_tests.sh +++ b/.ci/run_tests.sh @@ -3,14 +3,6 @@ set -e set -o pipefail -# TODO: Stop here for MinGW builds, -# building Neovim doesn't work yet. -if [[ "${BUILD_MINGW}" == ON ]]; then - echo "Neovim doesn't build on MinGW yet; stopping build." - touch "${SUCCESS_MARKER}" - exit -fi - CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${CI_DIR}/common/build.sh" source "${CI_DIR}/common/test.sh" diff --git a/.travis.yml b/.travis.yml index 9d529c2632..84caa349ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ env: # Travis has 1.5 virtual cores according to # http://docs.travis-ci.com/user/speeding-up-the-build/#Paralellizing-your-build-on-one-VM - MAKE_CMD="make -j2" - # Update PATH for pip and MinGW. - - PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:$HOME/.local/mingw32/bin:$PATH" + # Update PATH for pip. + - PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:$PATH" # LLVM symbolizer path. - LLVM_SYMBOLIZER="$(which llvm-symbolizer-3.4)" # Build directory for Neovim. @@ -34,8 +34,6 @@ env: - CMAKE_FLAGS_32BIT="-DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32 -DCMAKE_IGNORE_PATH=/lib:/usr/lib:/usr/local/lib -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/i386-linux-gnu.toolchain.cmake" - # Additional CMake flags for MinGW builds. - - CMAKE_FLAGS_MINGW="-DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/mingw32-w64-cross-travis.toolchain.cmake" # Environment variables for Clang sanitizers. - ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1:log_path=$LOG_DIR/asan" - ASAN_SYMBOLIZER_PATH="$LLVM_SYMBOLIZER" @@ -81,8 +79,6 @@ matrix: compiler: clang - os: osx compiler: gcc-4.9 - - os: linux - env: BUILD_MINGW=ON fast_finish: true before_install: .ci/before_install.sh |