Settings: Prevent mutex deadlock in remove() (#7803)

[minetest.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 23f6d5ebb15c665ce6e174a19aebdf9ac12bc2af..bdf3e8d42df9ea4b5378df6c94e2cc1394b89d2b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,27 +34,15 @@ matrix:
     - env: PLATFORM=Win32
       compiler: gcc
       os: linux
-      addons:
-        apt:
-          packages: ['gcc-mingw-w64-i686', 'g++-mingw-w64-i686', 'binutils-mingw-w64-i686']
-          sources: &sources
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb http://mirrors.kernel.org/ubuntu xenial main universe'
 
     - env: PLATFORM=Win64
       compiler: gcc
       os: linux
-      addons:
-        apt:
-          packages: ['gcc-mingw-w64-x86-64', 'g++-mingw-w64-x86-64', 'binutils-mingw-w64-x86-64']
-          sources: &sources
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb http://mirrors.kernel.org/ubuntu xenial main universe'
 
-    - env: PLATFORM=Unix
-      compiler: clang
-      os: osx
-      osx_image: xcode8
+#    - env: PLATFORM=Unix
+#      compiler: clang
+#      os: osx
+#      osx_image: xcode8
 
     - env: PLATFORM=Unix COMPILER=gcc-6
       compiler: gcc