diff options
| -rw-r--r-- | .builds/freebsd.yml | 2 | ||||
| -rw-r--r-- | .builds/openbsd.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | src/nvim/CMakeLists.txt | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 36f44f236b..bb7fbeb78b 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -20,7 +20,7 @@ sources: environment: SOURCEHUT: 1 LANG: en_US.UTF-8 - CMAKE_EXTRA_FLAGS: -DTRAVIS_CI_BUILD=ON -DMIN_LOG_LEVEL=3 + CMAKE_EXTRA_FLAGS: -DCI_BUILD=ON -DMIN_LOG_LEVEL=3 tasks: - build-deps: | diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml index 5fa6556066..2f0f970dcb 100644 --- a/.builds/openbsd.yml +++ b/.builds/openbsd.yml @@ -19,7 +19,7 @@ sources: environment: SOURCEHUT: 1 LC_CTYPE: en_US.UTF-8 - CMAKE_EXTRA_FLAGS: -DTRAVIS_CI_BUILD=ON -DMIN_LOG_LEVEL=3 + CMAKE_EXTRA_FLAGS: -DCI_BUILD=ON -DMIN_LOG_LEVEL=3 tasks: - build-deps: | diff --git a/.travis.yml b/.travis.yml index 4aebae3986..3b92d3e103 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ env: # Nvim log file. - NVIM_LOG_FILE="$BUILD_DIR/.nvimlog" # Default CMake flags. - - CMAKE_FLAGS="-DTRAVIS_CI_BUILD=ON + - CMAKE_FLAGS="-DCI_BUILD=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX -DBUSTED_OUTPUT_TYPE=nvim diff --git a/CMakeLists.txt b/CMakeLists.txt index 94c8583b22..78588fb3da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -322,10 +322,10 @@ if(HAS_DIAG_COLOR_FLAG) endif() endif() -option(TRAVIS_CI_BUILD "Travis/sourcehut CI, extra flags will be set" OFF) +option(CI_BUILD "CI, extra flags will be set" OFF) -if(TRAVIS_CI_BUILD) - message(STATUS "Travis/sourcehut CI build enabled") +if(CI_BUILD) + message(STATUS "CI build enabled") add_compile_options(-Werror) if(DEFINED ENV{BUILD_32BIT}) # Get some test coverage for unsigned char diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c7d8398bf0..c179db0c46 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -110,7 +110,7 @@ and [AppVeyor]. # To get a full backtrace: # 1. Rebuild with debug info. rm -rf nvim.core build - gmake CMAKE_BUILD_TYPE=RelWithDebInfo CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DMIN_LOG_LEVEL=3" nvim + gmake CMAKE_BUILD_TYPE=RelWithDebInfo CMAKE_EXTRA_FLAGS="-DCI_BUILD=ON -DMIN_LOG_LEVEL=3" nvim # 2. Run the failing test to generate a new core file. TEST_FILE=test/functional/foo.lua gmake functionaltest lldb build/bin/nvim -c nvim.core diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 9b6e9fe13e..8ec087c626 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -617,14 +617,14 @@ if(CLANG_ASAN_UBSAN) message(STATUS "Enabling Clang address sanitizer and undefined behavior sanitizer for nvim.") check_c_compiler_flag(-fno-sanitize-recover=all SANITIZE_RECOVER_ALL) if(SANITIZE_RECOVER_ALL) - if(TRAVIS_CI_BUILD) + if(CI_BUILD) # Try to recover from all sanitize issues so we get reports about all failures set(SANITIZE_RECOVER -fsanitize-recover=all) # Clang 3.6+ else() set(SANITIZE_RECOVER -fno-sanitize-recover=all) # Clang 3.6+ endif() else() - if(TRAVIS_CI_BUILD) + if(CI_BUILD) # Try to recover from all sanitize issues so we get reports about all failures set(SANITIZE_RECOVER -fsanitize-recover) # Clang 3.5- else() |