diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2016-03-09 19:01:33 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2016-03-14 11:05:58 +0100 |
| commit | b1093e62d521b2625f1651a3c2083a0c3e92ffad (patch) | |
| tree | b9c68aeae8e3e7e181424f908b0f04079184e20c | |
| parent | 084f2c4b419839e4954ff78290a84843ff092a97 (diff) | |
| download | libgit2-b1093e62d521b2625f1651a3c2083a0c3e92ffad.tar.gz | |
Remove CI support for mingw32cmn/remove-mingw32
The tests have never run successfully and we do have successful builds
of mingw-w64, so remove these CI builds which do not add value.
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | appveyor.yml | 6 | ||||
| -rwxr-xr-x | script/appveyor-mingw.sh | 4 | ||||
| -rw-r--r-- | script/toolchain-mingw32.cmake | 13 |
4 files changed, 1 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index 2f3ffe355..bfc0fac48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,6 @@ matrix: - os: osx compiler: gcc include: - - compiler: i586-mingw32msvc-gcc - env: OPTIONS="-DCMAKE_TOOLCHAIN_FILE=../script/toolchain-mingw32.cmake" SKIP_TESTS=1 - os: linux - compiler: gcc env: COVERITY=1 os: linux diff --git a/appveyor.yml b/appveyor.yml index 3ed3c49a1..9f5f0bacf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,15 +13,9 @@ environment: - GENERATOR: "Visual Studio 11 Win64" ARCH: 64 - GENERATOR: "MSYS Makefiles" - ARCH: 32 - - GENERATOR: "MSYS Makefiles" ARCH: i686 # this is for 32-bit MinGW-w64 - GENERATOR: "MSYS Makefiles" ARCH: 64 -matrix: - allow_failures: - - GENERATOR: "MSYS Makefiles" - ARCH: 32 cache: - i686-4.9.2-release-win32-sjlj-rt_v3-rev1.7z - x86_64-4.9.2-release-win32-seh-rt_v3-rev1.7z diff --git a/script/appveyor-mingw.sh b/script/appveyor-mingw.sh index 48e0bad0a..198801875 100755 --- a/script/appveyor-mingw.sh +++ b/script/appveyor-mingw.sh @@ -1,9 +1,7 @@ #!/bin/sh set -e cd `dirname "$0"`/.. -if [ "$ARCH" = "32" ]; then - echo 'C:\MinGW\ /MinGW' > /etc/fstab -elif [ "$ARCH" = "i686" ]; then +if [ "$ARCH" = "i686" ]; then f=i686-4.9.2-release-win32-sjlj-rt_v3-rev1.7z if ! [ -e $f ]; then curl -LsSO http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/sjlj/$f diff --git a/script/toolchain-mingw32.cmake b/script/toolchain-mingw32.cmake deleted file mode 100644 index 2536b01c3..000000000 --- a/script/toolchain-mingw32.cmake +++ /dev/null @@ -1,13 +0,0 @@ -# CMake toolchain file for Win32 cross-compile -SET(CMAKE_SYSTEM_NAME Windows) - -SET(CMAKE_C_COMPILER i586-mingw32msvc-gcc) -SET(CMAKE_RC_COMPILER i586-mingw32msvc-windres) - -SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc) - -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(ENV{PKG_CONFIG_LIBDIR} ${CMAKE_FIND_ROOT_PATH}/lib/pkgconfig) |