feat(installer): add verify-plugins hook (#2751)

This commit is contained in:
kylo252 2022-06-23 16:11:47 +02:00 committed by GitHub
parent ecd3441287
commit 8989984b78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 182 additions and 20 deletions

View file

@ -246,9 +246,19 @@ local core_plugins = {
}, },
} }
for _, entry in ipairs(core_plugins) do local default_snapshot_path = join_paths(get_lvim_base_dir(), "snapshots", "default.json")
if not os.getenv "LVIM_DEV_MODE" then local content = vim.fn.readfile(default_snapshot_path)
entry["lock"] = true local default_sha1 = vim.fn.json_decode(content)
local get_default_sha1 = function(spec)
local short_name, _ = require("packer.util").get_plugin_short_name(spec)
return default_sha1[short_name] and default_sha1[short_name].commit
end
for _, spec in ipairs(core_plugins) do
if not vim.env.LVIM_DEV_MODE then
-- Manually lock the commit hash since Packer's snapshots are unreliable in headless mode
spec["commit"] = get_default_sha1(spec)
end end
end end

View file

@ -38,7 +38,8 @@ a.describe("plugin-loader", function()
assert.truthy(package.loaded[plugin]) assert.truthy(package.loaded[plugin])
end end
end) end)
a.it("should be able to rollback plugins without errors", function()
pending("should be able to rollback plugins without errors", function()
local plugin = { name = "onedarker.nvim" } local plugin = { name = "onedarker.nvim" }
plugin.path = vim.tbl_filter(function(package) plugin.path = vim.tbl_filter(function(package)
return package:match(plugin.name) return package:match(plugin.name)

View file

@ -1,18 +1,18 @@
local sp = os.getenv "SNAPSHOT_PATH" local sp = os.getenv "SNAPSHOT_PATH"
local function call_proc(process, opts, cb) local function call_proc(process, opts, cb)
local std_output = "" local output, error_output = "", ""
local error_output = "" local handle_stdout = function(err, chunk)
assert(not err, err)
if chunk then
output = output .. chunk
end
end
local function onread(_, is_stderr) local handle_stderr = function(err, chunk)
return function(err, data) assert(not err, err)
if data then if chunk then
if is_stderr then error_output = error_output .. chunk
error_output = (error_output or "") .. err
else
std_output = (std_output or "") .. data
end
end
end end
end end
@ -26,7 +26,7 @@ local function call_proc(process, opts, cb)
handle = uv.spawn( handle = uv.spawn(
process, process,
{ args = opts.args, cwd = uv.cwd(), stdio = stdio }, { args = opts.args, cwd = opts.cwd or uv.cwd(), stdio = stdio },
vim.schedule_wrap(function(code) vim.schedule_wrap(function(code)
if code ~= 0 then if code ~= 0 then
stdout:read_stop() stdout:read_stop()
@ -42,13 +42,13 @@ local function call_proc(process, opts, cb)
end end
check:stop() check:stop()
handle:close() handle:close()
cb(code, std_output, error_output) cb(code, output, error_output)
end) end)
end) end)
) )
uv.read_start(stdout, onread(handle, false)) uv.read_start(stdout, handle_stdout)
uv.read_start(stderr, onread(handle, true)) uv.read_start(stderr, handle_stderr)
return handle return handle
end end
@ -91,11 +91,12 @@ local function write_lockfile(verbose)
end end
local handle = call_proc("git", { args = { "ls-remote", entry.url, "HEAD" } }, on_done) local handle = call_proc("git", { args = { "ls-remote", entry.url, "HEAD" } }, on_done)
assert(handle)
table.insert(active_jobs, handle) table.insert(active_jobs, handle)
end end
print("active: " .. #active_jobs) print("active: " .. #active_jobs)
print("parsers: " .. #default_plugins) print("plugins: " .. #default_plugins)
vim.wait(#active_jobs * 60 * 1000, function() vim.wait(#active_jobs * 60 * 1000, function()
return completed == #active_jobs return completed == #active_jobs

134
utils/ci/verify_plugins.lua Normal file
View file

@ -0,0 +1,134 @@
local completed = 0
local collection = {}
local active_jobs = {}
local fmt = string.format
local core_plugins = require "lvim.plugins"
local default_snapshot_path = join_paths(get_lvim_base_dir(), "snapshots", "default.json")
local fd = io.open(default_snapshot_path, "rb")
local content
if fd then
content = fd:read "*a"
end
local default_sha1 = vim.json.decode(content)
local get_short_name = function(spec)
return spec[1]:match "/(%S*)"
end
local get_default_sha1 = function(spec)
local short_name, _ = get_short_name(spec)
assert(default_sha1[short_name])
return default_sha1[short_name].commit
end
local is_directory = require("lvim.utils").is_directory
-- see packer.init()
local packdir = join_paths(get_runtime_dir(), "site", "pack", "packer")
local packer_config = { opt_dir = join_paths(packdir, "opt"), start_dir = join_paths(packdir, "start") }
local is_optional = function(spec)
return spec.opt or spec.event or spec.cmd or spec.module
end
local get_install_path = function(spec)
local prefix = is_optional(spec) and packer_config.opt_dir or packer_config.start_dir
local path = join_paths(prefix, get_short_name(spec))
assert(is_directory(path))
return path
end
local function call_proc(process, opts, cb)
local output, error_output = "", ""
local handle_stdout = function(err, chunk)
assert(not err, err)
if chunk then
output = output .. chunk
end
end
local handle_stderr = function(err, chunk)
assert(not err, err)
if chunk then
error_output = error_output .. chunk
end
end
local uv = vim.loop
local handle
local stdout = uv.new_pipe(false)
local stderr = uv.new_pipe(false)
local stdio = { nil, stdout, stderr }
handle = uv.spawn(
process,
{ args = opts.args, cwd = opts.cwd or uv.cwd(), stdio = stdio },
vim.schedule_wrap(function(code)
if code ~= 0 then
stdout:read_stop()
stderr:read_stop()
end
local check = uv.new_check()
check:start(function()
for _, pipe in ipairs(stdio) do
if pipe and not pipe:is_closing() then
return
end
end
check:stop()
handle:close()
cb(code, output, error_output)
end)
end)
)
uv.read_start(stdout, handle_stdout)
uv.read_start(stderr, handle_stderr)
return handle
end
local function verify_core_plugins(verbose)
for _, spec in pairs(core_plugins) do
if not spec.disable then
table.insert(collection, {
name = get_short_name(spec),
commit = get_default_sha1(spec),
path = get_install_path(spec),
})
end
end
for _, entry in pairs(collection) do
local on_done = function(code, result, errors)
completed = completed + 1
if code ~= 0 then
io.write(errors .. "\n")
-- os.exit(code)
else
if verbose then
io.write(fmt("verified [%s]\n", entry.name))
end
end
local current_commit = result:gsub("\n", ""):gsub([[']], [[]])
-- just in case there are some extra qutoes or it's a longer commit hash
if current_commit ~= entry.commit then
io.write(fmt("mismatch at [%s]: expected [%s], got [%s]\n", entry.name, entry.commit, current_commit))
os.exit(1)
end
end
local handle = call_proc("git", { args = { "log", "--pretty='%h'", "-1" }, cwd = entry.path }, on_done)
assert(handle)
table.insert(active_jobs, handle)
end
vim.wait(#active_jobs * 60 * 1000, function()
return completed == #active_jobs
end)
end
verify_core_plugins()
vim.cmd "q"

View file

@ -0,0 +1,5 @@
#!/usr/bin/env bash
set -e
lvim --headless \
-c "luafile ./utils/ci/verify_plugins.lua"

View file

@ -206,6 +206,15 @@ function check_neovim_min_version() {
fi fi
} }
function verify_core_plugins() {
msg "Verifying core plugins"
if ! bash "$LUNARVIM_BASE_DIR/utils/ci/verify_plugins.sh"; then
echo "[ERROR]: Unable to verify plugins, makde sure to manually run ':PackerSync' when starting lvim for the first time."
exit 1
fi
echo "Verification complete!"
}
function validate_lunarvim_files() { function validate_lunarvim_files() {
local verify_version_cmd='if v:errmsg != "" | cquit | else | quit | endif' local verify_version_cmd='if v:errmsg != "" | cquit | else | quit | endif'
if ! "$INSTALL_PREFIX/bin/lvim" --headless -c 'LvimUpdate' -c "$verify_version_cmd" &>/dev/null; then if ! "$INSTALL_PREFIX/bin/lvim" --headless -c 'LvimUpdate' -c "$verify_version_cmd" &>/dev/null; then
@ -418,6 +427,8 @@ function setup_lvim() {
-c 'PackerSync' -c 'PackerSync'
echo "Packer setup complete" echo "Packer setup complete"
verify_core_plugins
} }
function print_logo() { function print_logo() {