ci: don't skip swift anymore

I think this was a nvim 0.6 issue
This commit is contained in:
Stephan Seitz
2022-04-15 16:33:01 +02:00
committed by Stephan Seitz
parent 5633f897a7
commit 901b31f66c
2 changed files with 22 additions and 28 deletions

View File

@@ -87,6 +87,4 @@ jobs:
run: echo "SKIP_SWIFT_CHECK=TRUE" >> $GITHUB_ENV
- name: Check query files
env:
SKIP_SWIFT_CHECK: ${{ env.SKIP_SWIFT_CHECK }}
run: $NVIM --headless -c "luafile ./scripts/check-queries.lua" -c "q"

View File

@@ -47,32 +47,28 @@ local function do_check()
io_print "::group::Check parsers"
for _, lang in pairs(parsers) do
-- NOTE: this is a temporary workaround to skip swift tests on ubuntu
-- stable and should be removed once neovim 0.7 is released.
if vim.fn.getenv "SKIP_SWIFT_CHECK" == vim.NIL or lang ~= "swift" then
timings[lang] = {}
for _, query_type in pairs(query_types) do
local before = vim.loop.hrtime()
local ok, query = pcall(queries.get_query, lang, query_type)
local after = vim.loop.hrtime()
local duration = after - before
table.insert(timings, { duration = duration, lang = lang, query_type = query_type })
io_print("Checking " .. lang .. " " .. query_type .. string.format(" (%.02fms)", duration * 1e-6))
if not ok then
vim.api.nvim_err_writeln(query)
last_error = query
else
if query then
for _, capture in ipairs(query.captures) do
local is_valid = (
vim.startswith(capture, "_") -- Helpers.
or vim.tbl_contains(captures[query_type], capture)
)
if not is_valid then
local error = string.format("(x) Invalid capture @%s in %s for %s.", capture, query_type, lang)
io_print(error)
last_error = error
end
timings[lang] = {}
for _, query_type in pairs(query_types) do
local before = vim.loop.hrtime()
local ok, query = pcall(queries.get_query, lang, query_type)
local after = vim.loop.hrtime()
local duration = after - before
table.insert(timings, { duration = duration, lang = lang, query_type = query_type })
io_print("Checking " .. lang .. " " .. query_type .. string.format(" (%.02fms)", duration * 1e-6))
if not ok then
vim.api.nvim_err_writeln(query)
last_error = query
else
if query then
for _, capture in ipairs(query.captures) do
local is_valid = (
vim.startswith(capture, "_") -- Helpers.
or vim.tbl_contains(captures[query_type], capture)
)
if not is_valid then
local error = string.format("(x) Invalid capture @%s in %s for %s.", capture, query_type, lang)
io_print(error)
last_error = error
end
end
end