diff options
| author | Daniel Hahler <git@thequod.de> | 2019-12-01 06:45:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-01 06:45:35 +0100 |
| commit | bff42cd7b33a764c2c54204106523137b1cf00e8 (patch) | |
| tree | 6461faba747a18d169c0c6c384ebbeb25b00f8d9 | |
| parent | 590082a58fa623adf6cb5a2f7ac756d366e3119c (diff) | |
| parent | cd6f755cf77369f8c165daf016eec7506ea9a702 (diff) | |
| download | rneovim-bff42cd7b33a764c2c54204106523137b1cf00e8.tar.gz rneovim-bff42cd7b33a764c2c54204106523137b1cf00e8.tar.bz2 rneovim-bff42cd7b33a764c2c54204106523137b1cf00e8.zip | |
ci: revisit OpenBSD/FreeBSD config (#11477)
| -rw-r--r-- | .builds/freebsd.yml | 8 | ||||
| -rw-r--r-- | .builds/openbsd.yml | 28 | ||||
| -rw-r--r-- | src/nvim/tui/terminfo.c | 3 |
3 files changed, 22 insertions, 17 deletions
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 9ffd6d9c37..36f44f236b 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -29,12 +29,16 @@ tasks: - build: | cd neovim gmake CMAKE_BUILD_TYPE=Release CMAKE_EXTRA_FLAGS="${CMAKE_EXTRA_FLAGS}" nvim -- test: | +- functionaltest: | cd neovim - gmake unittest functionaltest + gmake functionaltest +- unittest: | + cd neovim + gmake unittest # Unfortunately, oldtest is tanking hard on sourcehut's FreeBSD instance # and not producing any logs as a result. So don't do this task for now. +# Ref: https://github.com/neovim/neovim/pull/11477#discussion_r352095005. # - test-oldtest: | # cd neovim # gmake oldtest diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml index 6796802051..ed2962998c 100644 --- a/.builds/openbsd.yml +++ b/.builds/openbsd.yml @@ -16,26 +16,28 @@ packages: sources: - https://github.com/neovim/neovim +environment: + SOURCEHUT: 1 + LC_CTYPE: en_US.UTF-8 + CMAKE_EXTRA_FLAGS: -DTRAVIS_CI_BUILD=ON -DMIN_LOG_LEVEL=3 + tasks: -- build: | +- build-deps: | export AUTOCONF_VERSION=2.69 export AUTOMAKE_VERSION=1.15 - cd neovim - mkdir .deps - cd .deps + mkdir neovim/.deps + cd neovim/.deps cmake -G Ninja ../third-party/ cmake --build . --config Debug - cd .. - mkdir build - cd build - cmake -G Ninja -DMIN_LOG_LEVEL=3 .. +- build: | + mkdir neovim/build + cd neovim/build + cmake -G Ninja $CMAKE_EXTRA_FLAGS .. cmake --build . --config Debug ./bin/nvim --version -- test: | - export LC_CTYPE=en_US.UTF-8 - # functional tests +- functionaltest: | cd neovim/build cmake --build . --config Debug --target functionaltest - # oldtests - cd .. +- oldtest: | + cd neovim gmake oldtest diff --git a/src/nvim/tui/terminfo.c b/src/nvim/tui/terminfo.c index 14023ce2cb..03173afe07 100644 --- a/src/nvim/tui/terminfo.c +++ b/src/nvim/tui/terminfo.c @@ -47,9 +47,8 @@ bool terminfo_is_bsd_console(const char *term) // like cursor-shaping. Assume that TERM=xterm is degraded. #8644 return strequal(term, "xterm") && !!os_getenv("XTERM_VERSION"); # endif -#else - return false; #endif + return false; } /// Loads a built-in terminfo db when we (unibilium) failed to load a terminfo |