Browse Source

build/doc/CI: remove/update quickbuild references #11258

tags/nightly
Justin M. Keyes 1 month ago
parent
commit
019c8d13dd
No account linked to committer's email address
8 changed files with 27 additions and 34 deletions
  1. +2
    -2
      CMakeLists.txt
  2. +15
    -10
      CONTRIBUTING.md
  3. +2
    -2
      runtime/doc/if_lua.txt
  4. +5
    -5
      runtime/doc/intro.txt
  5. +0
    -4
      test/functional/api/server_requests_spec.lua
  6. +1
    -2
      test/functional/helpers.lua
  7. +2
    -4
      test/helpers.lua
  8. +0
    -5
      test/unit/mbyte_spec.lua

+ 2
- 2
CMakeLists.txt View File

@@ -317,10 +317,10 @@ if(HAS_DIAG_COLOR_FLAG)
endif()
endif()

option(TRAVIS_CI_BUILD "Travis/QuickBuild CI, extra flags will be set" OFF)
option(TRAVIS_CI_BUILD "Travis/sourcehut CI, extra flags will be set" OFF)

if(TRAVIS_CI_BUILD)
message(STATUS "Travis/QuickBuild CI build enabled")
message(STATUS "Travis/sourcehut CI build enabled")
add_compile_options(-Werror)
if(DEFINED ENV{BUILD_32BIT})
# Get some test coverage for unsigned char

+ 15
- 10
CONTRIBUTING.md View File

@@ -85,7 +85,7 @@ the VCS/git logs more valuable.

### Automated builds (CI)

Each pull request must pass the automated builds on [Travis CI], [QuickBuild]
Each pull request must pass the automated builds on [Travis CI], [sourcehut]
and [AppVeyor].

- CI builds are compiled with [`-Werror`][gcc-warnings], so compiler warnings
@@ -100,14 +100,19 @@ and [AppVeyor].
- The [lint](#lint) build checks modified lines _and their immediate
neighbors_, to encourage incrementally updating the legacy style to meet our
[style](#style). (See [#3174][3174] for background.)
- [How to investigate QuickBuild failures](https://github.com/neovim/neovim/pull/4718#issuecomment-217631350)
- QuickBuild uses this invocation:
```
mkdir -p build/${params.get("buildType")} \
&& cd build/${params.get("buildType")} \
&& cmake -G "Unix Makefiles" -DBUSTED_OUTPUT_TYPE=TAP -DCMAKE_BUILD_TYPE=${params.get("buildType")}
-DTRAVIS_CI_BUILD=ON ../.. && ${node.getAttribute("make", "make")}
VERBOSE=1 nvim unittest-prereqs functionaltest-prereqs
- CI for freebsd and openbsd runs on [sourcehut].
- To get a backtrace on freebsd (after connecting via ssh):
```sh
sudo pkg install tmux # If you want tmux.
lldb build/bin/nvim -c nvim.core

# 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
# 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
```

### Clang scan-build
@@ -223,7 +228,7 @@ as context, use the `-W` argument as well.
[review-checklist]: https://github.com/neovim/neovim/wiki/Code-review-checklist
[3174]: https://github.com/neovim/neovim/issues/3174
[Travis CI]: https://travis-ci.org/neovim/neovim
[QuickBuild]: http://neovim-qb.szakmeister.net/dashboard
[sourcehut]: https://builds.sr.ht/~jmk
[AppVeyor]: https://ci.appveyor.com/project/neovim/neovim
[Merge a Vim patch]: https://github.com/neovim/neovim/wiki/Merging-patches-from-upstream-Vim
[Clang report]: https://neovim.io/doc/reports/clang/

+ 2
- 2
runtime/doc/if_lua.txt View File

@@ -361,7 +361,7 @@ Note that underscore-prefixed functions (e.g. "_os_proc_children") are
internal/private and must not be used by plugins.

------------------------------------------------------------------------------
VIM.API *lua-api*
VIM.API *lua-api* *vim.api*

`vim.api` exposes the full Nvim |API| as a table of Lua functions.

@@ -371,7 +371,7 @@ Example: to use the "nvim_get_current_line()" API function, call
print(tostring(vim.api.nvim_get_current_line()))

------------------------------------------------------------------------------
VIM.LOOP *lua-loop*
VIM.LOOP *lua-loop* *vim.loop*

`vim.loop` exposes all features of the Nvim event-loop. This is a low-level
API that provides functionality for networking, filesystem, and process

+ 5
- 5
runtime/doc/intro.txt View File

@@ -378,11 +378,11 @@ notation meaning equivalent decimal value(s) ~
<kEqual> keypad = *keypad-equal*
<kEnter> keypad Enter *keypad-enter*
<k0> - <k9> keypad 0 to 9 *keypad-0* *keypad-9*
<S-...> shift-key *shift* *<S-*
<C-...> control-key *control* *ctrl* *<C-*
<M-...> alt-key or meta-key *META* *ALT* *<M-*
<A-...> same as <M-...> *<A-*
<D-...> command-key or "super" key *<D-*
<S-> shift-key *shift* *<S-*
<C-> control-key *control* *ctrl* *<C-*
<M-> alt-key or meta-key *META* *ALT* *<M-*
<A-…> same as <M-…> *<A-*
<D-> command-key or "super" key *<D-*
-----------------------------------------------------------------------

Note: The shifted cursor keys, the help key, and the undo key are only

+ 0
- 4
test/functional/api/server_requests_spec.lua View File

@@ -345,10 +345,6 @@ describe('server -> client', function()

describe('connecting to its own pipe address', function()
it('does not deadlock', function()
if not helpers.isCI('travis') and helpers.is_os('mac') then
-- It does, in fact, deadlock on QuickBuild. #6851
pending("deadlocks on QuickBuild")
end
local address = funcs.serverlist()[1]
local first = string.sub(address,1,1)
ok(first == '/' or first == '\\')

+ 1
- 2
test/functional/helpers.lua View File

@@ -29,10 +29,8 @@ local module = {
}

local start_dir = lfs.currentdir()
module.nvim_prog = (
os.getenv('NVIM_PROG')
or os.getenv('NVIM_PRG')
os.getenv('NVIM_PRG')
or global_helpers.test_build_dir .. '/bin/nvim'
)
-- Default settings for the test session.

+ 2
- 4
test/helpers.lua View File

@@ -715,13 +715,11 @@ end

function module.isCI(name)
local any = (name == nil)
assert(any or name == 'appveyor' or name == 'quickbuild' or name == 'travis'
or name == 'sourcehut')
assert(any or name == 'appveyor' or name == 'travis' or name == 'sourcehut')
local av = ((any or name == 'appveyor') and nil ~= os.getenv('APPVEYOR'))
local tr = ((any or name == 'travis') and nil ~= os.getenv('TRAVIS'))
local qb = ((any or name == 'quickbuild') and nil ~= lfs.attributes('/usr/home/quickbuild'))
local sh = ((any or name == 'sourcehut') and nil ~= os.getenv('SOURCEHUT'))
return tr or av or qb or sh
return tr or av or sh

end


+ 0
- 5
test/unit/mbyte_spec.lua View File

@@ -8,11 +8,6 @@ local mbyte = helpers.cimport("./src/nvim/mbyte.h")
local charset = helpers.cimport('./src/nvim/charset.h')

describe('mbyte', function()
if helpers.isCI('quickbuild') then
pending("crashes on quickbuild", function() end)
return
end

-- Array for composing characters
local intp = ffi.typeof('int[?]')
local function to_intp()

Loading…
Cancel
Save