Merge pull request libgit2#3671 from libgit2/cmn/remove-mingw32

Edward Thomson · Edward Thomson · commit fa31ee683587 · 2016-03-14T15:00:59.000Z
Remove CI support for mingw32
diff --git 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
@@ -12,16 +12,10 @@ environment:
     ARCH: 32
   - 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
@@ -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
