aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-06-20 01:51:42 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-06-20 01:51:41 +0200
commite28a7a366d7c5179e2bb9f16f67ea5e848576273 (patch)
tree2a637542818799d864238e9329d8491567cdb378
parent954df0ea03ff93a888af97714732aca257820229 (diff)
downloadrneovim-e28a7a366d7c5179e2bb9f16f67ea5e848576273.tar.gz
rneovim-e28a7a366d7c5179e2bb9f16f67ea5e848576273.tar.bz2
rneovim-e28a7a366d7c5179e2bb9f16f67ea5e848576273.zip
CI/Travis: restore ASAN build to first stage #10274
* ci: Travis: move ASAN build to first stage again Ref: https://github.com/neovim/neovim/pull/10238#issuecomment-503556762 * rename stages * move gcov to second stage, restore order
-rw-r--r--.travis.yml20
1 files changed, 10 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 2431100d13..08f5306755 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,10 +49,14 @@ env:
jobs:
include:
- - stage: baseline builds
+ - stage: baseline
os: linux
- compiler: gcc
- env: GCOV=gcov CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
+ 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: gcc
env: >
@@ -68,7 +72,7 @@ jobs:
os: linux
env: CI_TARGET=lint
- - stage: Other builds
+ - stage: second stage
os: osx
compiler: clang
osx_image: xcode10.1 # macOS 10.13
@@ -77,12 +81,8 @@ jobs:
osx_image: xcode10.1 # macOS 10.13
- 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: clang
env: CLANG_SANITIZER=TSAN