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

[minetest.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 2cd867295757058407dcf279804a6ec74cba1b04..bdf3e8d42df9ea4b5378df6c94e2cc1394b89d2b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,103 @@
 language: cpp
-compiler:
-  - gcc
-  - clang
-before_install:
-  - if [ $CC = "clang" ]; then export PATH="/usr/bin/:$PATH"; sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'; sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 92DE8183; sudo apt-get update; sudo apt-get install llvm-3.1; sudo apt-get install clang; fi
-  - sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev
-script: cmake . && make
+before_install: ./util/travis/before_install.sh
+script: ./util/travis/script.sh
+sudo: required
+dist: trusty
+group: edge
 notifications:
   email: false
+matrix:
+  fast_finish: true
+  include:
+
+    - env: CLANG_FORMAT=clang-format-7
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-format-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+
+    - env: CLANG_TIDY=clang-tidy-7
+      compiler: clang
+      os: linux
+      script: ./util/travis/clangtidy.sh
+      addons:
+        apt:
+          packages: ['clang-7', 'clang++-7', 'clang-tools-7', 'clang-tidy-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+
+    - env: PLATFORM=Win32
+      compiler: gcc
+      os: linux
+
+    - env: PLATFORM=Win64
+      compiler: gcc
+      os: linux
+
+#    - env: PLATFORM=Unix
+#      compiler: clang
+#      os: osx
+#      osx_image: xcode8
+
+    - env: PLATFORM=Unix COMPILER=gcc-6
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages: ['gcc-6', 'g++-6']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+
+    - env: PLATFORM=Unix COMPILER=gcc-8
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages: ['gcc-8', 'g++-8']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+
+    - env: PLATFORM=Unix COMPILER=clang-3.6
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-3.6', 'clang++-3.6']
+          sources: &sources
+            - llvm-toolchain-trusty-3.6
+
+    - env: PLATFORM=Unix COMPILER=clang-7
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-7', 'clang++-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+
+    - env: PLATFORM=Unix COMPILER=clang-7 FREETYPE=0
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-7', 'clang++-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+
+    - env: PLATFORM=Unix COMPILER=clang-7 VALGRIND=1
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['valgrind', 'clang-7', 'clang++-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+