Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix lock packages #5532 #5539

Merged
merged 1 commit into from
Aug 29, 2024
Merged

fix lock packages #5532 #5539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions xmake/modules/private/action/require/impl/install_packages.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,9 +810,6 @@ function _install_packages(requires, opt)
if option.get("upgrade") then
_show_upgraded_packages(packages)
end

-- lock packages
lock_packages(packages)
return packages
end

Expand All @@ -822,7 +819,12 @@ function main(requires, opt)
-- and we will check package toolchains before calling package.on_load
--
-- @see https://github.com/xmake-io/xmake/pull/5466
_install_packages(requires, table.join(opt or {}, {toolchain = true}))
return _install_packages(requires, opt)
local packages = {}
table.join2(packages, _install_packages(requires, table.join(opt or {}, {toolchain = true})))
table.join2(packages, _install_packages(requires, opt))

-- lock packages
lock_packages(packages)
return packages
end

Loading