Browse Source

build: Rename TRAVIS_CI_BUILD variable to CI_BUILD

pull/13287/head
James McCoy 2 months ago
parent
commit
86eba08a4b
No known key found for this signature in database GPG Key ID: DFE691AE331BA3DB
6 changed files with 9 additions and 9 deletions
  1. +1
    -1
      .builds/freebsd.yml
  2. +1
    -1
      .builds/openbsd.yml
  3. +1
    -1
      .travis.yml
  4. +3
    -3
      CMakeLists.txt
  5. +1
    -1
      CONTRIBUTING.md
  6. +2
    -2
      src/nvim/CMakeLists.txt

+ 1
- 1
.builds/freebsd.yml View File

@ -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: |

+ 1
- 1
.builds/openbsd.yml View File

@ -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: |

+ 1
- 1
.travis.yml View File

@ -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

+ 3
- 3
CMakeLists.txt View File

@ -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

+ 1
- 1
CONTRIBUTING.md View File

@ -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

+ 2
- 2
src/nvim/CMakeLists.txt View File

@ -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()

Loading…
Cancel
Save