diff options
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rwxr-xr-x | src/nvim/CMakeLists.txt | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index d9b67eafe7..0d58d2bd85 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,7 @@ env: CIRRUS_CLONE_DEPTH: '2' LANG: en_US.UTF-8 - CMAKE_EXTRA_FLAGS: -DCI_BUILD=ON -DMIN_LOG_LEVEL=3 + CMAKE_EXTRA_FLAGS: -DCI_BUILD=ON freebsd_task: name: FreeBSD diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da4bcc6ad4..4814e89a69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -254,7 +254,7 @@ jobs: - name: Build run: | - cmake -B build -G Ninja -D CI_BUILD=ON -D CMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX -D MIN_LOG_LEVEL=3 ${{ matrix.flags }} + cmake -B build -G Ninja -D CI_BUILD=ON -D CMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX ${{ matrix.flags }} cmake --build build - if: "!cancelled()" @@ -383,7 +383,7 @@ jobs: run: make deps - name: Build - run: make CMAKE_FLAGS="-D CI_BUILD=ON -D CMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX -D MIN_LOG_LEVEL=3" + run: make CMAKE_FLAGS="-D CI_BUILD=ON -D CMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX" - name: Install run: make install diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 7409a5e5c5..a193af6d51 100755 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -412,6 +412,9 @@ else() endif() # Log level (MIN_LOG_LEVEL in log.h) +if($ENV{CI} MATCHES "true") + set(MIN_LOG_LEVEL 3) +endif() if("${MIN_LOG_LEVEL}" MATCHES "^$") # Minimize logging for release-type builds. target_compile_definitions(main_lib INTERFACE MIN_LOG_LEVEL=$<IF:$<CONFIG:Debug>,1,3>) |