Skip to content

Commit f01ccbd

Browse files
Merge pull request #550 from harrisoncramer/develop
Merge pull request #548 from harrisoncramer/fix/force-rebuild-binary. Fixes binary builds. This is a #PATCH release.
2 parents 5152f72 + 9066178 commit f01ccbd

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

lua/gitlab/server.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ M.build = function(override)
122122
state.settings.root_path = u.get_root_path()
123123

124124
-- If the user provided a path to the server, don't build it.
125-
if state.settings.server.binary ~= nil then
126-
state.settings.server.binary_provided = true
125+
if state.settings.server.binary_provided then
127126
local binary_exists = vim.loop.fs_stat(state.settings.server.binary)
128127
if binary_exists == nil then
129128
u.notify(

lua/gitlab/state.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,9 @@ end
454454
---@param args Settings
455455
---@return Settings
456456
M.merge_settings = function(args)
457+
if args.server and args.server.binary ~= nil then
458+
M.settings.server.binary_provided = true
459+
end
457460
M.settings = u.merge(M.settings, args)
458461
return M.settings
459462
end

0 commit comments

Comments
 (0)