merge master

.travis.yml

@@ -56,8 +56,8 @@ jobs:
     # Initial test stage, if this fails everything else is cancelled.
     - stage: Test
       # Clang is consistently the fastest to build, so use it for the initial test.
-      # Clang 3.8, oldest supported Clang, build with Makefile with extra tests and json style check.
       env: CLANG=clang++-3.8 MODS=--mods=RL_Classes TEST_STAGE=1 CXXFLAGS='-Wno-error=unused-command-line-argument -D__extern_always_inline="extern __always_inline"'
+      name: "Clang 3.8 Make build with curses, style check and RL_Classes test"
       compiler: clang
       addons: &clang38
         apt:
@@ -66,24 +66,24 @@ jobs:
 
     # Then build different configurations and targets in parallel.
     - stage: "Main Compilers"
-      # GCC 5.3, oldest supported GCC, build with Makefile configured for Curses, disable LOCALIZE
       env: COMPILER=g++ LOCALIZE=0
+      name: "GCC 5.3 Make build with curses and no Localization"
       compiler: gcc
       addons: &gcc53
         apt:
           packages: ["g++-5=5.3.1-14ubuntu2", "libstdc++-5-dev=5.3.1-14ubuntu2", "gcc-5=5.3.1-14ubuntu2", "gcc-5-base=5.3.1-14ubuntu2", "cpp-5=5.3.1-14ubuntu2", "libgcc-5-dev=5.3.1-14ubuntu2", "libasan2=5.3.1-14ubuntu2", "libmpx0=5.3.1-14ubuntu2"]
           sources: [*apt_sources]
 
-    # GCC 8, latest supported GCC, build with Makefile configured with TILES and SOUND and use address sanitization
     - env: COMPILER=g++-8 CXXFLAGS='-Wno-implicit-fallthrough' TILES=1 SOUND=1 SANITIZE=address
+      name: "GCC 8 Make build with Tiles, Sound and address sanitization"
       compiler: gcc
       addons: &gcc8
         apt:
           packages: ["g++-8",   "g++-8-multilib",   "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
           sources: *apt_sources
 
-    # Clang 8, latest supported Clang, build with Makefile and address sanitization, but disable some very long-running tests
     - env: CLANG=clang++-8 SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items"
+      name: "Clang 8 Make build with address sanitization, but long-running tests disabled"
       compiler: clang
       addons: &clang8
         apt:
@@ -92,23 +92,21 @@ jobs:
 
     - stage: "Platforms and Tidy"
     # MXE variant using alternate repository http://mirror.mxe.cc/repos/apt
-    # Mingw-w64 building with Tiles and Sound
       env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine' TILES=1 SOUND=1
+      name: "Mingw-w64 Make cross-compile to Windows with Tiles and Sound"
       compiler: gcc
       addons: &gcc
         apt:
           packages: ["wine"]
 
-    # macOS Tiles
-    # Xcode 10.1 building with Tiles and sound
     - env: CLANG=clang++ NATIVE=osx OSX_MIN=10.13 TILES=1 SOUND=1
+      name: "Xcode 10.1 Make build with Tiles and sound (macOS)"
       os: osx
       osx_image: xcode10.1
       compiler: clang
 
-    # Execute Clang-tidy with CMake, configured with Tiles and Sound
-    # (analysis only; no build or tests)
     - env: CLANG=clang++-8 TILES=1 SOUND=1 CXXFLAGS=-Wno-unused-command-line-argument CMAKE=1 CATA_CLANG_TIDY=clang-tidy-8
+      name: "Clang-tidy CMake build with Tiles and Sound"
       compiler: clang
       addons: &clang8
         apt:
@@ -117,46 +115,47 @@ jobs:
 
     # Finally check the compiler variants
     - stage: compilers
-    # GCC 5.4 is default on Xenial
+      # GCC 5.4 is default on Xenial
       env: COMPILER=g++
+      name: "GCC 5.4 Make build with Curses"
       if: type != pull_request
 
-    # GCC 6
     - env: COMPILER=g++-6
+      name: "GCC 6 Make build with Curses"
       if: type != pull_request
       compiler: gcc
       addons: &gcc6
         apt:
           packages: ["g++-6",   "g++-6-multilib",   "libc6-dbg", "libc6-dbg:i386"]
           sources: *apt_sources
 
-    # GCC 7, adding _GLIBCXX_DEBUG so that one build can test with that
     - env: COMPILER=g++-7 CXXFLAGS='-Wno-implicit-fallthrough -D_GLIBCXX_DEBUG' CODE_COVERAGE=true
+      name: "GCC 7 Make build with Curses, GLIBCXX_DEBUG and code coverage"
       if: type != pull_request
       compiler: gcc
       addons: &gcc7
         apt:
           packages: ["g++-7",   "g++-7-multilib",   "libc6-dbg", "libc6-dbg:i386", "lcov"]
           sources: *apt_sources
 
-    # GCC MinGW with only terminal support
     - env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine'
+      name: "Mingw-w64 Make build with Curses"
       if: type != pull_request
       addons: &gcc
         apt:
           packages: ["wine"]
 
-    # Clang 3.9
     - env: CLANG=clang++-3.9 CXXFLAGS='-Wno-error=unused-command-line-argument -D__extern_always_inline="extern __always_inline"'
+      name: "Clang 3.9 Make build with Curses"
       if: type != pull_request
       compiler: clang
       addons: &clang39
         apt:
           packages: ["clang-3.9", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"]
           sources: *apt_sources
 
-    # Clang 4.0
     - env: CLANG=clang++-4.0 CXXFLAGS=-Wno-error=unused-command-line-argument
+      name: "Clang 4 Make build with Curses"
       if: type != pull_request
       compiler: clang
       addons: &clang40
@@ -168,6 +167,7 @@ jobs:
     # Clang 5.0 (still on Trusty, because I could find no readily available
     # source on Xenial at time of writing)
     - env: CLANG=clang++-5.0 CXXFLAGS=-Wno-error=unused-command-line-argument
+      name: "Clang 5 Make build with Curses"
       if: type != pull_request
       dist: trusty
       compiler: clang
@@ -176,17 +176,17 @@ jobs:
           packages: ["clang-5.0", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"]
           sources: [*apt_sources, llvm-toolchain-trusty-5.0]
 
-    # CMake Clang 6.0 Tiles with CMAKE
     - env: CLANG=clang++-6.0 TILES=1 SOUND=1 CXXFLAGS=-Wno-error=unused-command-line-argument CMAKE=1 RELEASE=1
+      name: "Clang 6 CMake build with tiles and sound"
       if: type != pull_request
       compiler: clang
       addons: &clang60
         apt:
           packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
           sources: [*apt_sources, llvm-toolchain-xenial-6.0]
 
-    # Clang 7
     - env: CLANG=clang++-7
+      name: "Clang 7 Make build with Curses"
       if: type != pull_request
       compiler: clang
       addons: &clang7