From 352d5a971344e2402aaa8704b802fa7dfaaa3050 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 19 Jun 2019 01:20:09 +0200
Subject: ci: Travis: move gcov job to baseline (no allowed failures) (#10238)

* ci: Travis: move gcov job to baseline (no allowed failures)

* ci: Travis: use two stages only

Moves CLANG_SANITIZER=ASAN_UBSAN to second stage.
---
 .travis.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8ccc45084b..2431100d13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,12 +51,8 @@ jobs:
   include:
     - stage: baseline builds
       os: linux
-      compiler: clang-4.0
-      # Use Lua so that ASAN can test our embedded Lua support. 8fec4d53d0f6
-      env: >
-        CLANG_SANITIZER=ASAN_UBSAN
-        CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
-        ASAN_SYMBOLIZE=asan_symbolize-4.0
+      compiler: gcc
+      env: GCOV=gcov CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
     - os: linux
       compiler: gcc
       env: >
@@ -72,7 +68,7 @@ jobs:
       os: linux
       env: CI_TARGET=lint
 
-    - stage: OSX builds
+    - stage: Other builds
       os: osx
       compiler: clang
       osx_image: xcode10.1  # macOS 10.13
@@ -80,15 +76,17 @@ jobs:
       compiler: gcc
       osx_image: xcode10.1  # macOS 10.13
 
-    - stage: Flaky builds
-      os: linux
-      compiler: gcc
-      env: GCOV=gcov CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
+    - os: linux
+      compiler: clang-4.0
+      # Use Lua so that ASAN can test our embedded Lua support. 8fec4d53d0f6
+      env: >
+        CLANG_SANITIZER=ASAN_UBSAN
+        CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
+        ASAN_SYMBOLIZE=asan_symbolize-4.0
     - os: linux
       compiler: clang
       env: CLANG_SANITIZER=TSAN
   allow_failures:
-    - env: GCOV=gcov CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
     - env: CLANG_SANITIZER=TSAN
   fast_finish: true
 
-- 
cgit